搜索及任务修改
This commit is contained in:
+23
-14
@@ -243,12 +243,12 @@ public class DistrictController {
|
||||
}
|
||||
} else {
|
||||
BooleanQuery query = new BooleanQuery();
|
||||
Query q1 = new TermQuery(new Term("keyword", model.getKeyword()));
|
||||
q1.setBoost(0.99f);
|
||||
query.add(q1, Occur.SHOULD);
|
||||
// Query q2 = new TermQuery(new Term("keyword_cjk", model.getKeyword()));
|
||||
// q2.setBoost(0.01f);
|
||||
// query.add(q2, Occur.SHOULD);
|
||||
// Query q1 = new TermQuery(new Term("keyword", model.getKeyword()));
|
||||
// q1.setBoost(0.99f);
|
||||
// query.add(q1, Occur.SHOULD);
|
||||
Query q2 = new TermQuery(new Term("keyword_cjk", model.getKeyword()));
|
||||
q2.setBoost(0.1f);
|
||||
query.add(q2, Occur.SHOULD);
|
||||
params.add(new QueryParam("$sr", new SrQuery(query)));
|
||||
}
|
||||
}
|
||||
@@ -1306,7 +1306,7 @@ public class DistrictController {
|
||||
&& StringUtils.isNotBlank(district.getRegion())) {
|
||||
// signFiledEditFlag(district, null);
|
||||
districtService.save(district);
|
||||
districtUpdateTaskService.createTask(district, 5);
|
||||
districtUpdateTaskService.createTask(district, 5, null);
|
||||
}
|
||||
|
||||
if (model.isGoPic()) {
|
||||
@@ -2238,13 +2238,7 @@ public class DistrictController {
|
||||
districtService.updateById(data, district.getId());
|
||||
|
||||
//创建更新任务,用为更新常州农商行数据
|
||||
District newDist = districtService.findDistrictById(district.getId());
|
||||
District distTask = new District();
|
||||
distTask.setCity(newDist.getCity());
|
||||
distTask.setRegion(newDist.getRegion());
|
||||
distTask.setName(newDist.getName());
|
||||
distTask.setEstateType2(newDist.getEstateType2());
|
||||
districtUpdateTaskService.createTask(distTask, 5);
|
||||
createJnTask(district.getId(), null);
|
||||
msg = "保存成功了!!!";
|
||||
}
|
||||
|
||||
@@ -2254,6 +2248,17 @@ public class DistrictController {
|
||||
return model;
|
||||
}
|
||||
|
||||
private void createJnTask(String id, Integer type){
|
||||
District newDist = districtService.findDistrictById(id);
|
||||
District distTask = new District();
|
||||
distTask.setCity(newDist.getCity());
|
||||
distTask.setRegion(newDist.getRegion());
|
||||
distTask.setName(newDist.getName());
|
||||
distTask.setEstateType2(newDist.getEstateType2());
|
||||
distTask.setId(id);
|
||||
districtUpdateTaskService.createTask(distTask, 5, type);
|
||||
}
|
||||
|
||||
public Object checkNamesAction(DistrictModel model) {
|
||||
|
||||
List<QueryParam> params = new ArrayList<QueryParam>();
|
||||
@@ -2415,10 +2420,12 @@ public class DistrictController {
|
||||
JsonModel ret = new JsonModel();
|
||||
if (StringUtils.isNotBlank(model.getId()) && ObjectId.isValid(model.getId())) {
|
||||
districtService.logicDeleteById(model.getId());
|
||||
createJnTask(model.getId(), 1);
|
||||
} else if (model.getIds() != null) {
|
||||
String[] ids = model.getIds().toString().split(",");
|
||||
for (String id : ids) {
|
||||
districtService.logicDeleteById(id);
|
||||
createJnTask(id, 1);
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
@@ -2430,10 +2437,12 @@ public class DistrictController {
|
||||
public Object restoreAction(DistrictModel model) throws UnsupportedEncodingException {
|
||||
if (ObjectId.isValid(model.getId())) {
|
||||
districtService.restoreById(model.getId());
|
||||
createJnTask(model.getId(), null);
|
||||
} else if (model.getIds() != null) {
|
||||
String[] ids = model.getIds().split("_");
|
||||
for (String id : ids) {
|
||||
districtService.restoreById(id);
|
||||
createJnTask(id, null);
|
||||
}
|
||||
}
|
||||
model.setViewType("redirect");
|
||||
|
||||
+1
-1
@@ -22,6 +22,6 @@ public interface DistrictUpdateTaskDao extends MongoDao<DistrictUpdateTask> {
|
||||
|
||||
void createTask(District district);
|
||||
|
||||
void createTask(District district, int status);
|
||||
void createTask(District district, int status, Integer type);
|
||||
|
||||
}
|
||||
|
||||
+7
-1
@@ -87,7 +87,7 @@ public class DistrictUpdateTaskDaoImpl extends MongoDaoImpl<DistrictUpdateTask>
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createTask(District district, int status) {
|
||||
public void createTask(District district, int status, Integer type) {
|
||||
DistrictUpdateTask task = new DistrictUpdateTask();
|
||||
task.setCity(district.getCity());
|
||||
task.setRegion(district.getRegion());
|
||||
@@ -99,6 +99,12 @@ public class DistrictUpdateTaskDaoImpl extends MongoDaoImpl<DistrictUpdateTask>
|
||||
}else{
|
||||
task.setEstateType("district");
|
||||
}
|
||||
if(null != type){
|
||||
task.setType(type);
|
||||
}
|
||||
if(StringUtils.isNotBlank(district.getId())){
|
||||
task.setCommId(district.getId());
|
||||
}
|
||||
this.save(task);
|
||||
}
|
||||
|
||||
|
||||
@@ -27,6 +27,7 @@ public class DistrictUpdateTask implements MongoEntity {
|
||||
private Integer status; // 1:删除 2:区域,各称修改 3.关联删除 4.物业类型修改 5:新增小区
|
||||
private String msg;
|
||||
private String estateType;
|
||||
private String commId;
|
||||
|
||||
@Id
|
||||
@GeneratedValue
|
||||
@@ -121,4 +122,12 @@ public class DistrictUpdateTask implements MongoEntity {
|
||||
public void setNewCity(String newCity) {
|
||||
this.newCity = newCity;
|
||||
}
|
||||
@Column(name="comm_id")
|
||||
public String getCommId() {
|
||||
return commId;
|
||||
}
|
||||
|
||||
public void setCommId(String commId) {
|
||||
this.commId = commId;
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -24,5 +24,5 @@ public interface DistrictUpdateTaskService {
|
||||
|
||||
void createTask(District district);
|
||||
|
||||
void createTask(District district, int status);
|
||||
void createTask(District district, int status, Integer optType);
|
||||
}
|
||||
|
||||
+2
-2
@@ -32,8 +32,8 @@ public class DistrictUpdateTaskServiceImpl implements DistrictUpdateTaskService
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createTask(District district, int status) {
|
||||
districtUpdateTaskDao.createTask(district, status);
|
||||
public void createTask(District district, int status, Integer type) {
|
||||
districtUpdateTaskDao.createTask(district, status, type);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user