diff --git a/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoCondition.java b/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoCondition.java index c33f3a6..a7a1786 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoCondition.java +++ b/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoCondition.java @@ -5,15 +5,15 @@ import org.springframework.data.mongodb.core.query.Criteria; import java.util.Collection; /** - * 封装mongo 条件属性的操作 对于模糊查询的时候 obj为一个正则表达式 如: - * - *
  • 1.MongoCondition.newInstance("name", "^小七测试",MongoOper.LIKE) '^小七测试' 查询名字为小七测试开头
  • - *
  • 2.MongoCondition.newInstance("name", "小七测试$",MongoOper.LIKE) '小七测试$' 查询名字为小七测试结尾
  • - *
    + * 封装mongo 条件属性的操作 对于模糊查询的时候 obj为一个正则表达式 如: + * + *
  • 1.MongoCondition.newInstance("name", "^小七测试",MongoOper.LIKE) '^小七测试' 查询名字为小七测试开头
  • + *
  • 2.MongoCondition.newInstance("name", "小七测试$",MongoOper.LIKE) '小七测试$' 查询名字为小七测试结尾
  • + *
    *
    - * - * @link MongoOper + * * @author Administrator + * @link MongoOper */ public class MongoCondition { @@ -29,13 +29,10 @@ public class MongoCondition { /** * 创建一个实例 - * - * @param key - * 字段名 - * @param obj - * 值 - * @param oper - * 查询运算符 + * + * @param key 字段名 + * @param obj 值 + * @param oper 查询运算符 * @return */ public static MongoCondition newInstance(String key, Object obj, MongoOper oper) { @@ -53,19 +50,17 @@ public class MongoCondition { public MongoCondition() { criteria = new Criteria(); } + public MongoCondition(Criteria c) { criteria = c; } /** * and 条件查询 - * - * @param key - * 数据库中的字段名 - * @param obj - * 值 - * @param oper - * 运算符 @link MongoOper + * + * @param key 数据库中的字段名 + * @param obj 值 + * @param oper 运算符 @link MongoOper * @return */ public MongoCondition and(String key, Object obj, MongoOper oper) { @@ -81,7 +76,7 @@ public class MongoCondition { return this; } - public MongoCondition all(Collection o,String key) { + public MongoCondition all(Collection o, String key) { if (criteria == null) { criteria = Criteria.where(key); set(MongoOper.ALL, o, criteria); @@ -97,19 +92,19 @@ public class MongoCondition { /** * Query query = new Query(Criteria.where("b").elemMatch( Criteria.where("startDate").gte(date) .and("endDate").lte(date) ); - * + * * @param c * @return */ @SuppressWarnings("static-access") - public MongoCondition elemMatch(String field,MongoCondition c) { + public MongoCondition elemMatch(String field, MongoCondition c) { criteria.where(field).elemMatch(c.criteria); return this; } /** * Query query = new Query(Criteria.where("b").elemMatch( Criteria.where("startDate").gte(date) .and("endDate").lte(date) ); - * + * * @param c * @return */ @@ -117,9 +112,10 @@ public class MongoCondition { criteria.elemMatch(c.criteria); return this; } + /** * 2个查询条件的交集 - * + * * @param con * @return */ @@ -131,7 +127,7 @@ public class MongoCondition { /** * 2个查询条件的并集 - * + * * @param con * @return */ @@ -169,7 +165,7 @@ public class MongoCondition { /** * 如果是模糊匹配,obj则为需要匹配的正则表达式 - * + * * @param oper * @param obj * @param criteria @@ -185,12 +181,14 @@ public class MongoCondition { criteria.regex(String.valueOf(obj), "m"); } else if (MongoOper.LT == oper) { criteria.lt(obj); + } else if (MongoOper.LTE == oper) { + criteria.lte(obj); } else if (MongoOper.NE == oper) { criteria.ne(obj); - }else if(MongoOper.ALL==oper){ - if(obj instanceof Collection){ - criteria.all((Collection)obj); - }else{ + } else if (MongoOper.ALL == oper) { + if (obj instanceof Collection) { + criteria.all((Collection) obj); + } else { criteria.all(obj); } } @@ -198,7 +196,7 @@ public class MongoCondition { /** * 把当前条件转成查询对象 - * + * * @return */ public MongoQuery toMongoQuery() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/GuideLineController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/GuideLineController.java new file mode 100644 index 0000000..b943523 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/GuideLineController.java @@ -0,0 +1,44 @@ +package com.lyms.platform.operate.web.controller; + +import com.lyms.platform.biz.service.GuidelinesService; +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.operate.web.request.GuideQuery; +import com.lyms.platform.pojo.Guidelines; +import com.lyms.platform.query.GuidelinesQuery; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.validation.Valid; +import java.util.List; + +/** + * + * 指导意见 + * + * Created by Administrator on 2016/8/4 0004. + */ +@Controller +public class GuideLineController extends BaseController { + @Autowired + private GuidelinesService guidelinesService; + @ResponseBody + @RequestMapping(method = RequestMethod.GET,value = "/guide") + public String matchGuide(@Valid GuideQuery guideQuery){ + GuidelinesQuery guidelinesQuery=new GuidelinesQuery(); + guidelinesQuery.setType(guideQuery.getType()); + guidelinesQuery.setMaxStart(guideQuery.getNum()); + guidelinesQuery.setMinEnd(guideQuery.getNum()); + List list = guidelinesService.queryGuidelines(guidelinesQuery); + StringBuilder stringBuilder=new StringBuilder(128); + if(CollectionUtils.isNotEmpty(list)){ + for(Guidelines guidelines:list){ + stringBuilder.append(guidelines.getCategory()).append(" ").append(guidelines.getContent()).append("\r\n"); + } + } + return stringBuilder.toString(); + } +}