From 2b5cba9897e9a8b5921cc6da5e5095f210abeb8d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Apr 2020 16:44:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?topiccomments=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ResiTopicCommentController.java | 42 +++++++++++++++++++ .../epmet/controller/ResiTopicController.java | 13 ------ 2 files changed, 42 insertions(+), 13 deletions(-) create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicCommentController.java diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicCommentController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicCommentController.java new file mode 100644 index 0000000000..37ace59d99 --- /dev/null +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicCommentController.java @@ -0,0 +1,42 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; +import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO; +import com.epmet.service.ResiTopicService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Description 话题评论相关接口 + * @Author yinzuomei + * @Date 2020/4/30 16:42 + */ +@RestController +@RequestMapping("topic") +public class ResiTopicCommentController { + @Autowired + private ResiTopicService resiTopicService; + /** + * @Description 政府端群组管理-获取某个话题的评论列表 + * @Param tokenDto + * @Param ResiQueryCommentFormDTO + * @return Result> + * @Author wangc + * @Date 2020.04.01 23:49 + **/ + @PostMapping("topiccomments") + Result> topicComments(@LoginUser TokenDto tokenDto, @RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){ + ValidatorUtils.validateEntity(queryCommentFormDTO); + return resiTopicService.topicComments(queryCommentFormDTO); + } +} + diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java index f821df15c9..6686e605f6 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java @@ -70,19 +70,6 @@ public class ResiTopicController { return resiTopicService.topicDetail(topicDetailFormDTO); } - /** - * @Description 政府端群组管理-获取某个话题的评论列表 - * @Param tokenDto - * @Param ResiQueryCommentFormDTO - * @return Result> - * @Author wangc - * @Date 2020.04.01 23:49 - **/ - @PostMapping("topiccomments") - Result> topicComments(@LoginUser TokenDto tokenDto, @RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){ - ValidatorUtils.validateEntity(queryCommentFormDTO); - return resiTopicService.topicComments(queryCommentFormDTO); - } } From 38dee30efa61dfc03699bbf138db3cf1686f85e9 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Apr 2020 16:50:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E7=AB=AF-=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=B7=BB=E5=8A=A0-Bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/AddAgencyFormDTO.java | 10 ++++------ .../epmet/constant/CustomerAgencyConstant.java | 16 ++++++++++++++++ .../com/epmet/controller/AgencyController.java | 16 ++++++++++++++++ 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java index 0e64901007..a177306a68 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java @@ -69,22 +69,20 @@ public class AddAgencyFormDTO implements Serializable { /** * 省份 */ - @NotBlank(message = "省级名称不能为空") - @Length(max=30,message = "省份名称不能超过30个字") + @NotBlank(message = "省级机关名称不能为空") + @Length(max=30,message = "省级机关名称不能超过30个字") private String province; /** * 城市 */ - @NotBlank(message = "市级名称不能为空") - @Length(max=30,message = "市级名称不能超过30个字") + @Length(max=30,message = "市级机关名称不能超过30个字") private String city; /** * 区县 */ - @NotBlank(message = "区县名称不能为空") - @Length(max=30,message = "区县名称不能超过30个字") + @Length(max=30,message = "区县级机关名称不能超过30个字") private String district; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java index 3c28f465f9..7200bca2a3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java @@ -18,4 +18,20 @@ public interface CustomerAgencyConstant { * 组织删除失败 */ String DEL_EXCEPTION = "组织删除失败"; + /** + * 机关级别-省级 + */ + String PROVINCE_LEVEL = "province"; + /** + * 机关级别-市级 + */ + String CITY_LEVEL = "city"; + /** + * 市级名称不能为空 + */ + String CITY_EXCEPTION = "市级机关名称不能为空"; + /** + * 区县名称不能为空 + */ + String DISTRICT_EXCEPTION = "区县级机关名称不能为空"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java index 184dfc1a87..31a61eba22 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java @@ -18,9 +18,11 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constant.CustomerAgencyConstant; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.AddAgencyResultDTO; @@ -29,6 +31,7 @@ import com.epmet.dto.result.AgencysResultDTO; import com.epmet.dto.result.SubAgencyResultDTO; import com.epmet.entity.CustomerAgencyEntity; import com.epmet.service.AgencyService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -57,6 +60,19 @@ public class AgencyController { @PostMapping("addagency") public Result addAgency(@LoginUser TokenDto tokenDTO, @RequestBody AddAgencyFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); + //机构级别是市级以上则市、区县名称可不传值，是区县级以上则区县名称可不传值 + if(!CustomerAgencyConstant.PROVINCE_LEVEL.equals(formDTO.getLevel())&&!CustomerAgencyConstant.CITY_LEVEL.equals(formDTO.getLevel())){ + if(StringUtils.isBlank(formDTO.getCity())){ + throw new RenException(CustomerAgencyConstant.CITY_EXCEPTION); + } + if(StringUtils.isBlank(formDTO.getDistrict())){ + throw new RenException(CustomerAgencyConstant.DISTRICT_EXCEPTION); + } + }else if(!CustomerAgencyConstant.PROVINCE_LEVEL.equals(formDTO.getLevel())){ + if(StringUtils.isBlank(formDTO.getCity())){ + throw new RenException(CustomerAgencyConstant.CITY_EXCEPTION); + } + } return agencyService.addAgency(formDTO); } From 927027b049a48f51928d4cc6a6a71b514dc1032c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Apr 2020 16:53:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E3=80=81=E5=B7=B2=E5=AE=A1=E6=A0=B8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=BD=91=E6=A0=BCbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PartyMemberConfirmServiceImpl.java | 6 +++--- .../service/impl/PartymemberBaseInfoServiceImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 63483599b3..dc9f3200d9 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -469,9 +469,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService Result gridInfoResult = govOrgFeignClient.queryGridInfo(partyMemberInfo.getGridId()); String gridFullPath = ""; if (gridInfoResult.success() && null != gridInfoResult.getData()) { - gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName(), - gridInfoResult.getData().getCommnuityName(), - gridInfoResult.getData().getGridName()); + gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(), + gridInfoResult.getData().getCommnuityName() == null?"":gridInfoResult.getData().getCommnuityName(), + gridInfoResult.getData().getGridName() == null?"":gridInfoResult.getData().getGridName()); gridFullPath = gridFullPath.replaceAll("--", "").trim(); } resultDTO.setGridFullPath(gridFullPath); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java index 72455af8c3..efc8925a8b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java @@ -325,9 +325,9 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl gridInfoResult = govOrgFeignClient.queryGridInfo(formDTO.getGridId()); String gridFullPath = ""; if (gridInfoResult.success() && null != gridInfoResult.getData()) { - gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName(), - gridInfoResult.getData().getCommnuityName(), - gridInfoResult.getData().getGridName()); + gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(), + gridInfoResult.getData().getCommnuityName() == null?"":gridInfoResult.getData().getCommnuityName(), + gridInfoResult.getData().getGridName() == null?"":gridInfoResult.getData().getGridName()); gridFullPath = gridFullPath.replaceAll("--", "").trim(); } //查询居民认证信息，获取居民头像