From 2ca64c74b2bb065952f7da06428ea9b6f0d6428a Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 17 Mar 2016 16:06:28 +0800 Subject: [PATCH] c --- .../platform/biz/service/BasicConfigService.java | 2 +- .../com/lyms/platform/pojo/BasicConfigQuery.java | 94 ---------------------- .../com/lyms/platform/query/BasicConfigQuery.java | 94 ++++++++++++++++++++++ .../web/controller/BasicConfigController.java | 60 +++----------- .../platform/operate/web/utils/TreeHelper.java | 49 +++++++++++ 5 files changed, 155 insertions(+), 144 deletions(-) delete mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfigQuery.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/TreeHelper.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java index 5442573..bfaa7f2 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java @@ -13,7 +13,7 @@ import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.dao.operator.Page; import com.lyms.platform.pojo.BasicConfig; -import com.lyms.platform.pojo.BasicConfigQuery; +import com.lyms.platform.query.BasicConfigQuery; @Service("basicConfigService") public class BasicConfigService { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfigQuery.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfigQuery.java deleted file mode 100644 index 54864d9..0000000 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfigQuery.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.lyms.platform.pojo; - -import com.lyms.platform.common.dao.BaseQuery; -import com.lyms.platform.common.dao.operator.MongoCondition; -import com.lyms.platform.common.dao.operator.MongoOper; -import com.lyms.platform.common.dao.operator.MongoQuery; - -public class BasicConfigQuery extends BaseQuery { - - private String id; - - private String parentId; - - private String code; - - private String name; - - private String keyword; - - public MongoQuery convertToQuery() { -// MongoCondition condition = MongoCondition.newInstance("1","1",MongoOper.IS); - MongoCondition condition = MongoCondition.newInstance(); - if (null != id) { - condition = condition.and("id", id, MongoOper.IS); - } - - if (null != code) { - condition = condition.and("code", code, MongoOper.IS); - } - if (null != name) { - condition = condition.and("name", name, MongoOper.IS); - } - if (null != parentId) { - condition = condition.and("parentId", parentId, MongoOper.IS); - } - if (null != keyword) { - MongoCondition con1= MongoCondition.newInstance("code", keyword, MongoOper.LIKE); - MongoCondition con = MongoCondition.newInstance("name", keyword, MongoOper.LIKE); - condition = condition.orCondition(new MongoCondition[]{con1,con}); - } - - return condition.toMongoQuery(); - } - - public String getKeyword() { - return keyword; - } - - public void setKeyword(String keyword) { - this.keyword = keyword; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - private int yn; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public int getYn() { - return yn; - } - - public void setYn(int yn) { - this.yn = yn; - } -} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java new file mode 100644 index 0000000..e118639 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java @@ -0,0 +1,94 @@ +package com.lyms.platform.query; + +import com.lyms.platform.common.dao.BaseQuery; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; + +public class BasicConfigQuery extends BaseQuery { + + private String id; + + private String parentId; + + private String code; + + private String name; + + private String keyword; + + public MongoQuery convertToQuery() { +// MongoCondition condition = MongoCondition.newInstance("1","1",MongoOper.IS); + MongoCondition condition = MongoCondition.newInstance(); + if (null != id) { + condition = condition.and("id", id, MongoOper.IS); + } + + if (null != code) { + condition = condition.and("code", code, MongoOper.IS); + } + if (null != name) { + condition = condition.and("name", name, MongoOper.IS); + } + if (null != parentId) { + condition = condition.and("parentId", parentId, MongoOper.IS); + } + if (null != keyword) { + MongoCondition con1= MongoCondition.newInstance("code", keyword, MongoOper.LIKE); + MongoCondition con = MongoCondition.newInstance("name", keyword, MongoOper.LIKE); + condition = condition.orCondition(new MongoCondition[]{con1,con}); + } + + return condition.toMongoQuery(); + } + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + private int yn; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public int getYn() { + return yn; + } + + public void setYn(int yn) { + this.yn = yn; + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java index d979b26..c742102 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java @@ -1,13 +1,8 @@ package com.lyms.platform.operate.web.controller; -import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; @@ -22,19 +17,16 @@ import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.request.BasicConfigRequest; import com.lyms.platform.operate.web.result.TreeNode; +import com.lyms.platform.operate.web.utils.TreeHelper; import com.lyms.platform.pojo.BasicConfig; -import com.lyms.platform.pojo.BasicConfigQuery; - +import com.lyms.platform.query.BasicConfigQuery; /** - * * 基础项配置接口 * * @author Administrator - * */ @Controller public class BasicConfigController { @@ -44,8 +36,10 @@ public class BasicConfigController { @RequestMapping(method = RequestMethod.GET, value = "/basicConfig") @ResponseBody public BaseListResponse queryBasicConfig(@RequestParam(value = "keywords", required = false) - String keywords,@RequestParam("page")int page,@RequestParam("limit")int limit) { - BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + String keywords, @RequestParam("page") + int page, @RequestParam("limit") + int limit) { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); basicConfigQuery.setNeed("1"); basicConfigQuery.setPage(page); basicConfigQuery.setLimit(limit); @@ -90,25 +84,13 @@ public class BasicConfigController { return baseResponse; } - public TreeNode recursiveTree(BasicConfig b) { - TreeNode node = converToNode(b); - List l2 = basicConfigService.queryByParentId(b.getId()); - for (BasicConfig b1 : l2) { - TreeNode node1 = recursiveTree(b1); - if (null != node1) { - node.getNodes().add(node1); - } - } - return node; - } - @RequestMapping(method = RequestMethod.GET, value = "/basicConfigTree") @ResponseBody public List buildJson() { List list = new ArrayList(); List l = basicConfigService.queryParentConfig(); for (BasicConfig b : l) { - TreeNode node = recursiveTree(b); + TreeNode node = TreeHelper.recursiveTree(b, basicConfigService); if (null != node) { list.add(node); } @@ -116,34 +98,14 @@ public class BasicConfigController { return list; } - private TreeNode converToNode(BasicConfig c) { - TreeNode node = new TreeNode(); - node.setCid(c.getId()); - node.setCname(c.getName()); - node.setPid(c.getParentId()); - return node; - } - - @RequestMapping(method = RequestMethod.POST, value = "/basicConfig"/*, consumes = { MediaType.APPLICATION_OCTET_STREAM_VALUE }*/) + @RequestMapping(method = RequestMethod.POST, value = "/basicConfig", consumes = { MediaType.APPLICATION_JSON_VALUE }) @ResponseBody - public BaseResponse addBasicConfig(@RequestBody List listReq) { - /* String json = ""; - try { - json = IOUtils.toString(httpServletRequest.getInputStream(), "utf8"); - } catch (IOException e) { - e.printStackTrace(); - } - List li = JsonUtil.toList(json, BasicConfigRequest.class); - - if (CollectionUtils.isNotEmpty(li)) { - for (BasicConfigRequest ba : li) { - basicConfigService.addBasicConfig(ba.convertToBasicConfig()); - } - }*/ + public BaseResponse addBasicConfig(@RequestBody + List listReq) { for (BasicConfigRequest ba : listReq) { basicConfigService.addBasicConfig(ba.convertToBasicConfig()); } - + BaseResponse baseResponse = new BaseResponse(); baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); baseResponse.setErrormsg("成功"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/TreeHelper.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/TreeHelper.java new file mode 100644 index 0000000..e0d12d2 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/TreeHelper.java @@ -0,0 +1,49 @@ +package com.lyms.platform.operate.web.utils; + +import java.util.List; + +import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.operate.web.result.TreeNode; +import com.lyms.platform.pojo.BasicConfig; + +/** + * 树形结构的帮助类 + * + * @author Administrator + */ +public class TreeHelper { + + /** + * 构建子节点信息 + * + * @param b + * 父节点信息 + * @param basicConfigService + * @return 节点 + */ + public static TreeNode recursiveTree(BasicConfig b, BasicConfigService basicConfigService) { + TreeNode node = converToNode(b); + List l2 = basicConfigService.queryByParentId(b.getId()); + for (BasicConfig b1 : l2) { + TreeNode node1 = recursiveTree(b1, basicConfigService); + if (null != node1) { + node.getNodes().add(node1); + } + } + return node; + } + + /** + * 创建新的节点 + * + * @param c + * @return + */ + private static TreeNode converToNode(BasicConfig c) { + TreeNode node = new TreeNode(); + node.setCid(c.getId()); + node.setCname(c.getName()); + node.setPid(c.getParentId()); + return node; + } +} -- 1.8.3.1