Commit 7856e32a7308f97314b2ace4910175a4cce175ee
1 parent
f43969cc77
Exists in
master
and in
8 other branches
增加产妇匹配社区接口
Showing 4 changed files with 74 additions and 6 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaMatcherCommunityRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
View file @
7856e32
... | ... | @@ -70,8 +70,8 @@ |
70 | 70 | |
71 | 71 | @TokenRequired |
72 | 72 | @RequestMapping(value = "/accesspermissions", method = RequestMethod.GET) |
73 | - public void getAccessPermission(HttpServletResponse response){ | |
74 | - | |
73 | + @ResponseBody | |
74 | + public List getAccessPermission(){ | |
75 | 75 | List<Map<String,Object>> list = new ArrayList<>(); |
76 | 76 | for(PermissionTypeEnums permissionTypeEnums:PermissionTypeEnums.values()){ |
77 | 77 | Map<String,Object> data = new HashMap<String,Object>(); |
78 | 78 | |
... | ... | @@ -79,10 +79,10 @@ |
79 | 79 | data.put("title",permissionTypeEnums.getTitle()); |
80 | 80 | list.add(data); |
81 | 81 | } |
82 | - ResultUtils.buildSuccessResultAndWrite(response,list); | |
82 | + return list; | |
83 | 83 | } |
84 | 84 | |
85 | -// @TokenRequired | |
85 | + @TokenRequired | |
86 | 86 | @RequestMapping(value = "/accesspermissions", method = RequestMethod.POST) |
87 | 87 | @ResponseBody |
88 | 88 | public BaseResponse addDataAccessPermission(@Valid AccessPermissionAddRequest accessPermissionAddRequest){ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
View file @
7856e32
... | ... | @@ -2,6 +2,7 @@ |
2 | 2 | |
3 | 3 | import javax.validation.Valid; |
4 | 4 | |
5 | +import com.lyms.platform.operate.web.request.PuerperaMatcherCommunityRequest; | |
5 | 6 | import org.springframework.beans.factory.annotation.Autowired; |
6 | 7 | import org.springframework.stereotype.Controller; |
7 | 8 | import org.springframework.web.bind.annotation.RequestMapping; |
... | ... | @@ -52,8 +53,20 @@ |
52 | 53 | //软删除数据 |
53 | 54 | return puerperaManagerFacade.deleteOnePuerperaById(id, Boolean.TRUE); |
54 | 55 | } |
55 | - | |
56 | - | |
56 | + | |
57 | + /** | |
58 | + * | |
59 | + * 产妇匹配社区 | |
60 | + * | |
61 | + * @param puerperaMatcherCommunityRequest 产妇匹配社区接口 | |
62 | + * | |
63 | + * @return | |
64 | + */ | |
65 | + @ResponseBody | |
66 | + @RequestMapping(value = "/matchpuerpera", method = RequestMethod.POST) | |
67 | + public BaseResponse matchCommunity(@Valid PuerperaMatcherCommunityRequest puerperaMatcherCommunityRequest){ | |
68 | + return puerperaManagerFacade.matchCommunity(puerperaMatcherCommunityRequest); | |
69 | + } | |
57 | 70 | /** |
58 | 71 | * 产妇管理修改 |
59 | 72 | * |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java
View file @
7856e32
... | ... | @@ -3,6 +3,9 @@ |
3 | 3 | import java.util.ArrayList; |
4 | 4 | import java.util.List; |
5 | 5 | |
6 | +import com.lyms.platform.common.utils.Assert; | |
7 | +import com.lyms.platform.operate.web.request.PuerperaMatcherCommunityRequest; | |
8 | +import com.sun.xml.internal.rngom.parse.host.Base; | |
6 | 9 | import org.apache.commons.collections.CollectionUtils; |
7 | 10 | import org.springframework.beans.factory.annotation.Autowired; |
8 | 11 | import org.springframework.stereotype.Component; |
... | ... | @@ -28,6 +31,22 @@ |
28 | 31 | |
29 | 32 | @Autowired |
30 | 33 | private PuerperaService puerperaService; |
34 | + | |
35 | + /** | |
36 | + * 修改产妇的社区 | |
37 | + * | |
38 | + * @param puerperaMatcherCommunityRequest 修改产妇社区 | |
39 | + * | |
40 | + * @return | |
41 | + */ | |
42 | + public BaseResponse matchCommunity(PuerperaMatcherCommunityRequest puerperaMatcherCommunityRequest){ | |
43 | + PuerperaModel puerperaModel = puerperaService.findOnePuerperaById(puerperaMatcherCommunityRequest.getParentId()); | |
44 | + Assert.notNull(puerperaModel,"产妇信息不存在"); | |
45 | + puerperaModel.setCommunityId(puerperaMatcherCommunityRequest.getCommunityId()); | |
46 | + puerperaService.updatePuerpera(puerperaModel); | |
47 | + //TODO 产妇分配了社区,需要给对应的社区提示消息 | |
48 | + return new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); | |
49 | + } | |
31 | 50 | |
32 | 51 | /** |
33 | 52 | * 修改产妇信息 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaMatcherCommunityRequest.java
View file @
7856e32
1 | +package com.lyms.platform.operate.web.request; | |
2 | + | |
3 | +import com.lyms.platform.common.core.annotation.form.Form; | |
4 | +import com.lyms.platform.common.core.annotation.form.FormParam; | |
5 | +import org.hibernate.validator.constraints.NotEmpty; | |
6 | + | |
7 | +/** | |
8 | + * 产妇匹配社区 | |
9 | + * | |
10 | + * Created by Administrator on 2016/3/31 0031. | |
11 | + */ | |
12 | +@Form | |
13 | +public class PuerperaMatcherCommunityRequest { | |
14 | + @FormParam("parentid") | |
15 | + @NotEmpty(message = "parerntid不能为空") | |
16 | + private String parentId; | |
17 | + @FormParam("communityid") | |
18 | + @NotEmpty(message = "communityId不能为空") | |
19 | + private String communityId; | |
20 | + | |
21 | + public String getCommunityId() { | |
22 | + return communityId; | |
23 | + } | |
24 | + | |
25 | + public void setCommunityId(String communityId) { | |
26 | + this.communityId = communityId; | |
27 | + } | |
28 | + | |
29 | + public String getParentId() { | |
30 | + return parentId; | |
31 | + } | |
32 | + | |
33 | + public void setParentId(String parentId) { | |
34 | + this.parentId = parentId; | |
35 | + } | |
36 | +} |