记得上下班打卡 | git大法好,push需谨慎

Commit b0512a9c authored by zhengfuxin's avatar zhengfuxin

学校增加搜索

parent 68787f34
package com.liquidnet.service.goblin.service.manage; package com.liquidnet.service.goblin.service.manage;
import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
import com.liquidnet.service.goblin.dto.vo.SmileSellDataDetailVO; import com.liquidnet.service.goblin.dto.vo.SmileSellDataDetailVO;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO; import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo; import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
...@@ -13,4 +14,5 @@ public interface SmileFrontService { ...@@ -13,4 +14,5 @@ public interface SmileFrontService {
public void deleteUser(String uid); public void deleteUser(String uid);
public boolean auth(String uid,SmileUserVO redisVo,boolean b); public boolean auth(String uid,SmileUserVO redisVo,boolean b);
public SmileSellDataDetailVO getSellDataDetail(String agentId, String ticketId, String activeName, String ticketName); public SmileSellDataDetailVO getSellDataDetail(String agentId, String ticketId, String activeName, String ticketName);
public List<SmileSchoolVo> getSchool(String name);
} }
...@@ -46,13 +46,21 @@ public class SmileUserController { ...@@ -46,13 +46,21 @@ public class SmileUserController {
} }
@GetMapping("getSchool") @GetMapping("getSchool")
@ApiOperation("获得学校") @ApiOperation("获得学校")
public ResponseDto<List<SmileSchoolVo>> getSchool() { public ResponseDto<List<SmileSchoolVo>> getSchool(String name) {
/* String userId = CurrentUtil.getCurrentUid(); /* String userId = CurrentUtil.getCurrentUid();
List<SmileSchoolVo> list=null; List<SmileSchoolVo> list=null;
if(redisUtil.hasKey(SmileRedisConst.SMILE_SCHOOL)){ if(redisUtil.hasKey(SmileRedisConst.SMILE_SCHOOL)){
list= (List<SmileSchoolVo>) redisUtil.get(SmileRedisConst.SMILE_SCHOOL); list= (List<SmileSchoolVo>) redisUtil.get(SmileRedisConst.SMILE_SCHOOL);
}*/ }*/
return ResponseDto.success(smileRedisUtils.getSchool()); if(StringUtil.isNotBlank(name)){
//mongodb 搜索
return ResponseDto.success(smileFrontService.getSchool(name));
}else{
return ResponseDto.success(smileRedisUtils.getSchool());
}
} }
@GetMapping("getPerformance") @GetMapping("getPerformance")
@ApiOperation("获得演出列表") @ApiOperation("获得演出列表")
......
...@@ -3,6 +3,7 @@ package com.liquidnet.service.service.impl; ...@@ -3,6 +3,7 @@ package com.liquidnet.service.service.impl;
import com.liquidnet.commons.lang.util.CollectionUtil; import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst; import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
import com.liquidnet.service.goblin.dto.vo.SmileSellDataDetailVO; import com.liquidnet.service.goblin.dto.vo.SmileSellDataDetailVO;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO; import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.goblin.service.manage.SmileFrontService; import com.liquidnet.service.goblin.service.manage.SmileFrontService;
...@@ -165,6 +166,11 @@ public class SmileFrontServiceImpl implements SmileFrontService { ...@@ -165,6 +166,11 @@ public class SmileFrontServiceImpl implements SmileFrontService {
return smileSellDataDetailVO; return smileSellDataDetailVO;
} }
@Override
public List<SmileSchoolVo> getSchool(String name) {
return smileMongoUtils.getSchoole(name);
}
public void setUser(SmileUserVO smileUserVO, SmileUserVO redisVo, String type) { public void setUser(SmileUserVO smileUserVO, SmileUserVO redisVo, String type) {
if (type.equals("1")) { if (type.equals("1")) {
......
package com.liquidnet.service.util; package com.liquidnet.service.util;
import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo; import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
...@@ -7,6 +8,8 @@ import org.springframework.data.mongodb.core.query.Criteria; ...@@ -7,6 +8,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
@Component @Component
public class SmileMongoUtils { public class SmileMongoUtils {
@Autowired @Autowired
...@@ -17,5 +20,12 @@ public class SmileMongoUtils { ...@@ -17,5 +20,12 @@ public class SmileMongoUtils {
KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName()); KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
} }
public List<SmileSchoolVo> getSchoole(String name){
Query query = new Query();
java.util.regex.Pattern pattern =
java.util.regex.Pattern.compile("^.*" + name + ".*$", java.util.regex.Pattern.CASE_INSENSITIVE);
query.addCriteria(Criteria.where("name").regex(pattern));
return mongoTemplate.find(query, SmileSchoolVo.class, SmileSchoolVo.class.getSimpleName());
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment