From 0f003b38adee8be61916046f62e485e71bf843e3 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 3 Aug 2021 10:59:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=88=91?= =?UTF-8?q?=E8=A6=81=E6=8A=A5=E4=BA=8B-=E6=9F=A5=E8=AF=A2=E4=BA=BA?= =?UTF-8?q?=E5=A4=A7=E4=BB=A3=E8=A1=A8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/feign/ResultDataResolver.java | 5 +- .../dto/form/ResiEventNpcListFormDTO.java | 13 +++++ .../dto/result/ResiEventNpcResultDTO.java | 28 +++++++++++ .../resi-home/resi-home-server/pom.xml | 10 ++++ .../epmet/controller/ResiEventController.java | 25 ++++++++++ .../com/epmet/service/ResiEventService.java | 11 +++++ .../service/impl/ResiEventServiceImpl.java | 47 +++++++++++++++++-- .../com/epmet/constant/BadgeConstant.java | 3 ++ .../dto/form/ListUserByBadgeFormDTO.java | 20 ++++++++ .../dto/result/ListUserByBadgeResultDTO.java | 20 ++++++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 9 ++++ .../EpmetUserOpenFeignClientFallback.java | 10 ++++ .../com/epmet/controller/BadgeController.java | 23 +++++++-- .../src/main/java/com/epmet/dao/BadgeDao.java | 8 ++++ .../java/com/epmet/service/BadgeService.java | 8 ++++ .../epmet/service/impl/BadgeServiceImpl.java | 4 ++ .../src/main/resources/mapper/BadgeDao.xml | 20 ++++++++ 17 files changed, 256 insertions(+), 8 deletions(-) create mode 100644 epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java create mode 100644 epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ListUserByBadgeResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/ResultDataResolver.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/ResultDataResolver.java index 1e44b924c2..5b56e64b1a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/ResultDataResolver.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/ResultDataResolver.java @@ -30,8 +30,11 @@ public interface ResultDataResolver { //} /** - * @Description 获取Result种的data，如果失败(返回result为null或者result.success为false)，那么抛出异常 + * @Description * @return + * @param targetServiceName 目标service名称 + * @param errorCode 错误码，可以为空，为空则使用上游服务抛出的错误码 + * @param errorInternalMsg 错误信息，可以为空，为空则使用上游服务抛出的异常信息 * @author wxz * @date 2021.06.07 22:45 */ diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java new file mode 100644 index 0000000000..97b856a8e6 --- /dev/null +++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java @@ -0,0 +1,13 @@ +package com.epmet.dto.form; + +import lombok.Data; + +/** + * @Description 我要报事人大代表列表 + * @author wxz + * @date 2021.08.03 09:16:59 +*/ +@Data +public class ResiEventNpcListFormDTO { + private String gridId; +} diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java new file mode 100644 index 0000000000..6f285807ce --- /dev/null +++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dto.result; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; + +/** + * @Description 我要报事-人大代表列表 + * @author wxz + * @date 2021.08.03 09:12:57 +*/ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ResiEventNpcResultDTO { + + private String userId; + + private String gridId; + + private String displayName; + + private String headImgUrl; + + private String agencyId; +} diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 5bfd93548c..041357ea74 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -68,6 +68,16 @@ 2.0.0 compile + + com.epmet + gov-org-client + 2.0.0 + + + com.epmet + epmet-user-client + 2.0.0 + diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java index c0a20d039a..fd316f0475 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -1,8 +1,18 @@ package com.epmet.controller; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.ResiEventNpcListFormDTO; +import com.epmet.dto.result.ResiEventNpcResultDTO; +import com.epmet.service.ResiEventService; +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 群众直报/报事controller * @author wxz @@ -12,6 +22,21 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("resi-event") public class ResiEventController { + @Autowired + private ResiEventService resiEventService; + /** + * @Description 查询人大代表列表 + * @return + * @author wxz + * @date 2021.08.03 09:17 + */ + @PostMapping("/npc-list-ingrid") + public Result> listNpc(@RequestBody ResiEventNpcListFormDTO input) { + ValidatorUtils.validateEntity(input); + String gridId = input.getGridId(); + List npcs = resiEventService.listNpcByGrid(gridId); + return new Result>().ok(npcs); + } } diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java index 3a426d3326..ec30ef44e8 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java @@ -1,9 +1,20 @@ package com.epmet.service; +import com.epmet.dto.result.ResiEventNpcResultDTO; + +import java.util.List; + /** * @Description 报事service * @author wxz * @date 2021.08.02 09:59:16 */ public interface ResiEventService { + /** + * @Description 查询网格的人大代表列表 + * @return + * @author wxz + * @date 2021.08.03 09:29 + */ + List listNpcByGrid(String gridId); } diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 2d8be957f7..b1871afb51 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -1,13 +1,54 @@ package com.epmet.service.impl; +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.feign.ResultDataResolver; +import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.BadgeConstant; +import com.epmet.dto.form.ListUserByBadgeFormDTO; +import com.epmet.dto.result.GridInfoResultDTO; +import com.epmet.dto.result.ListUserByBadgeResultDTO; +import com.epmet.dto.result.ResiEventNpcResultDTO; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.ResiEventService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.stream.Collectors; + /** - * @Description 报事service * @author wxz + * @Description 报事service * @date 2021.08.02 09:59:36 -*/ + */ @Service -public class ResiEventServiceImpl implements ResiEventService { +public class ResiEventServiceImpl implements ResiEventService, ResultDataResolver { + + @Autowired + GovOrgOpenFeignClient govOrgOpenFeignClient; + + @Autowired + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + + @Override + public List listNpcByGrid(String gridId) { + + // 查询网格所属的组织信息 + Result gridInfoResult = govOrgOpenFeignClient.queryGridInfo(gridId); + GridInfoResultDTO gridInfoData = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null); + String parentAgencyId = gridInfoData.getParentAgencyId(); + + //查询人大代表列表 + ListUserByBadgeFormDTO npcForm = new ListUserByBadgeFormDTO(gridId, BadgeConstant.BADGE_KEY_NPC); + Result> npcResult = epmetUserOpenFeignClient.listUsersByBadge(npcForm); + List npcData = getResultDataOrThrowsException(npcResult, ServiceConstant.EPMET_USER_SERVER, null, null); + + List npcResultList = npcData.stream() + .map(npc -> new ResiEventNpcResultDTO(npc.getUserId(), gridId, "人大代表-".concat(npc.getRealName()), npc.getHeadImgUrl(), parentAgencyId)) + .collect(Collectors.toList()); + + return npcResultList; + } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java index 3be3ce02c3..c8b52524f2 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java @@ -42,4 +42,7 @@ public interface BadgeConstant { String DEFAULT = "default"; + // 人大代表徽章KEY + String BADGE_KEY_NPC = "NPC"; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java new file mode 100644 index 0000000000..8d616bacf3 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.form; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ListUserByBadgeFormDTO { + + @NotBlank(message = "网格ID不能为空") + private String gridId; + + @NotBlank(message = "徽章key不能为空") + private String badgeKey; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ListUserByBadgeResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ListUserByBadgeResultDTO.java new file mode 100644 index 0000000000..24139d4161 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ListUserByBadgeResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author wxz + * @Description 根据徽章查询用户结果集 + * @date 2021.08.02 10:23:37 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ListUserByBadgeResultDTO { + private String userId; + private String gridId; + private String realName; + private String headImgUrl; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index e111a8fb6c..059ced9e35 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -605,4 +605,13 @@ public interface EpmetUserOpenFeignClient { */ @PostMapping("/epmetuser/staffpatrol/endpatrolJob") Result endPatrolJob(@RequestBody StartPatrolFormDTO formDTO); + + /** + * @Description 根据徽章查询用户列表 + * @return + * @author wxz + * @date 2021.08.02 10:27 + */ + @PostMapping("/epmetuser/badge/list-users-by-badge") + Result> listUsersByBadge(ListUserByBadgeFormDTO input); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 7398ecb56c..31c82beb05 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -422,4 +422,14 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "endPatrolJob", formDTO); } + /** + * @Description 根据徽章查询用户列表 + * @return + * @author wxz + * @date 2021.08.03 09:03 + */ + @Override + public Result> listUsersByBadge(ListUserByBadgeFormDTO input) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listUsersByBadge", input); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java index a5d13c581f..192fc3c5d3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java @@ -10,11 +10,9 @@ import com.epmet.dto.result.*; import com.epmet.redis.UserBadgeRedis; import com.epmet.service.BadgeService; 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 org.springframework.web.bind.annotation.*; +import javax.validation.constraints.NotBlank; import java.util.List; import java.util.Map; @@ -190,4 +188,21 @@ public class BadgeController { public Result> userBadges(@RequestBody UserBadgesFormDTO formDTO){ return new Result>().ok(badgeService.userBadges(formDTO)); } + + /** + * @Description + * @return + * @author wxz + * @date 2021.08.02 10:27 + */ + @PostMapping("list-users-by-badge") + public Result> listUsersByBadge(@RequestBody ListUserByBadgeFormDTO input) { + ValidatorUtils.validateEntity(input); + + String gridId = input.getGridId(); + String badgeKey = input.getBadgeKey(); + + List users = badgeService.listUsersByBadge(gridId, badgeKey); + return new Result>().ok(users); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java index a9dc7ee49a..5c4aab8dcb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java @@ -196,4 +196,12 @@ public interface BadgeDao extends BaseDao { * @date 2020/11/19 10:18 上午 */ int selectNextSort(@Param("customerId") String customerId); + + /** + * @Description 根据徽章查询人列表 + * @return + * @author wxz + * @date 2021.08.02 10:40 + */ + List listUsersByBadge(@Param("gridId") String gridId, @Param("badgeKey") String badgeKey); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java index f89f180458..fad619e87b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java @@ -192,4 +192,12 @@ public interface BadgeService extends BaseService { * @date 2021/4/22 下午4:17 */ List userBadges(UserBadgesFormDTO formDTO); + + /** + * @Description 根据徽章查询用户列表 + * @return + * @author wxz + * @date 2021.08.02 10:39 + */ + List listUsersByBadge(String gridId, String badgeKey); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java index dcdd39d4f1..985dd00c46 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java @@ -480,4 +480,8 @@ public class BadgeServiceImpl extends BaseServiceImpl imp return result; } + @Override + public List listUsersByBadge(String gridId, String badgeKey) { + return baseDao.listUsersByBadge(gridId, badgeKey); + } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml index c9be676412..560867c932 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml @@ -310,4 +310,24 @@ ORDER BY CREATED_TIME DESC LIMIT 1 + + + \ No newline at end of file From 33bc6098ab7a69f5fbd990e9e5e33e858050ffdd Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 3 Aug 2021 11:04:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?emm=20=E8=B5=B6=E7=B4=A7=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=20=E7=9C=81=E7=9D=80=E5=92=8C=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/EventListFormDTO.java | 29 ++++++++++ .../epmet/dto/form/UpdateViewTimeFormDTO.java | 29 ++++++++++ .../epmet/dto/result/EventListResultDTO.java | 48 +++++++++++++++++ .../com/epmet/controller/EventController.java | 53 +++++++++++++++++++ .../com/epmet/service/ResiEventService.java | 40 ++++++++------ .../service/impl/ResiEventServiceImpl.java | 25 +++++++++ 6 files changed, 207 insertions(+), 17 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java new file mode 100644 index 0000000000..eff8d5e66b --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/8/3 10:43 上午 + * @DESC + */ +@Data +public class EventListFormDTO implements Serializable { + + private static final long serialVersionUID = 5882062169112022561L; + + public interface EventListForm extends CustomerClientShowGroup{} + + /** + * 报事列表类型【已处理：processed 未处理：undisposed 已办结：transferred】 + */ + @NotBlank(message = "报事列表类型不能为空",groups = EventListForm.class) + private String eventType; + + @NotBlank(message = "",groups = EventListForm.class) + private String orgId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java new file mode 100644 index 0000000000..30e891cd78 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/8/3 10:55 上午 + * @DESC + */ +@Data +public class UpdateViewTimeFormDTO implements Serializable { + + private static final long serialVersionUID = 7104400078458366322L; + + public interface UpdateViewTimeForm extends CustomerClientShowGroup{} + + /** + * 居民端用户:resi_user；工作人员:staff + */ + @NotBlank(message = "viewType不能为空",groups = UpdateViewTimeForm.class) + private String viewType; + + @NotBlank(message = "事件ID不能为空",groups = UpdateViewTimeForm.class) + private String eventId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java new file mode 100644 index 0000000000..94853b80d1 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java @@ -0,0 +1,48 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2021/8/3 10:41 上午 + * @DESC + */ +@Data +public class EventListResultDTO implements Serializable { + + private static final long serialVersionUID = -8550265282744924930L; + + /** + * 报事标题 + */ + private String eventTitle; + + /** + * 报事时间 + */ + private String eventTime; + + /** + * 报事ID + */ + private String eventId; + + /** + * 是否立项【true：是，false：否】 + */ + private Boolean isProject; + + /** + * 红点显示【true：显示，false：不显示】 + */ + private Boolean redDot; + + /** + * 报事图片 + */ + private List eventImgs; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java new file mode 100644 index 0000000000..062740b5d7 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java @@ -0,0 +1,53 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.EventListFormDTO; +import com.epmet.dto.form.UpdateViewTimeFormDTO; +import com.epmet.dto.result.EventListResultDTO; +import com.epmet.service.ResiEventService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * 居民报事表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@RestController +@RequestMapping("event") +public class EventController { + + @Autowired + private ResiEventService resiEventService; + + /** + * @Description 群众直报（待处理、处理中、已办结）列表 + * @Param formDTO + * @author zxc + * @date 2021/8/3 10:53 上午 + */ + @PostMapping("eventlist") + public Result> eventList(@RequestBody EventListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, EventListFormDTO.EventListForm.class); + return new Result>().ok(resiEventService.eventList(formDTO)); + } + + /** + * @Description 查看报事时,更新时间操作 + * @Param formDTO + * @author zxc + * @date 2021/8/3 11:01 上午 + */ + @PostMapping("updateviewtime") + public Result updateViewTime(@RequestBody UpdateViewTimeFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.UpdateViewTimeForm.class); + resiEventService.updateViewTime(formDTO); + return new Result(); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java index bdcfedaab3..fec1527d3c 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java @@ -1,24 +1,13 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.form.EventListFormDTO; +import com.epmet.dto.form.UpdateViewTimeFormDTO; +import com.epmet.dto.result.EventListResultDTO; import com.epmet.entity.ResiEventEntity; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; /** * 居民报事表 @@ -27,4 +16,21 @@ import com.epmet.entity.ResiEventEntity; * @since v1.0.0 2021-08-03 */ public interface ResiEventService extends BaseService { + + /** + * @Description 群众直报（待处理、处理中、已办结）列表 + * @Param formDTO + * @author zxc + * @date 2021/8/3 10:53 上午 + */ + List eventList(EventListFormDTO formDTO); + + /** + * @Description 查看报事时,更新时间操作 + * @Param formDTO + * @author zxc + * @date 2021/8/3 11:01 上午 + */ + void updateViewTime(UpdateViewTimeFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 0b0814189a..a3b5e3cd81 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -19,10 +19,15 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.dao.ResiEventDao; +import com.epmet.dto.form.EventListFormDTO; +import com.epmet.dto.form.UpdateViewTimeFormDTO; +import com.epmet.dto.result.EventListResultDTO; import com.epmet.entity.ResiEventEntity; import com.epmet.service.ResiEventService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 居民报事表 * @@ -32,5 +37,25 @@ import org.springframework.stereotype.Service; @Service public class ResiEventServiceImpl extends BaseServiceImpl implements ResiEventService { + /** + * @Description 群众直报（待处理、处理中、已办结）列表 + * @Param formDTO + * @author zxc + * @date 2021/8/3 10:53 上午 + */ + @Override + public List eventList(EventListFormDTO formDTO) { + return null; + } + + /** + * @Description 查看报事时,更新时间操作 + * @Param formDTO + * @author zxc + * @date 2021/8/3 11:01 上午 + */ + @Override + public void updateViewTime(UpdateViewTimeFormDTO formDTO) { + } } \ No newline at end of file From da4c6b7429b92e4a33feb685fd1c81a467e363f5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 3 Aug 2021 11:12:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8A=93=E7=B4=A7=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E4=B8=8D=E5=90=88=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/EventListFormDTO.java | 2 +- .../com/epmet/dto/form/ReplyListFormDTO.java | 23 +++++++++++++++++++ .../epmet/dto/form/UpdateViewTimeFormDTO.java | 2 +- .../epmet/dto/result/ReplyListResultDTO.java | 18 +++++++++++++++ .../controller/ResiEventReplyController.java | 19 +++++++++++++++ .../epmet/service/ResiEventReplyService.java | 13 +++++++++++ .../impl/ResiEventReplyServiceImpl.java | 15 +++++++++++- 7 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java index eff8d5e66b..1815ecd434 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java @@ -16,7 +16,7 @@ public class EventListFormDTO implements Serializable { private static final long serialVersionUID = 5882062169112022561L; - public interface EventListForm extends CustomerClientShowGroup{} + public interface EventListForm{} /** * 报事列表类型【已处理：processed 未处理：undisposed 已办结：transferred】 diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java new file mode 100644 index 0000000000..20575626fd --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/8/3 11:07 上午 + * @DESC + */ +@Data +public class ReplyListFormDTO implements Serializable { + + private static final long serialVersionUID = 3875624725235229558L; + + public interface ReplyListForm{} + + @NotBlank(message = "报事ID不能为空",groups = ReplyListForm.class) + private String resiEventId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java index 30e891cd78..c2ca21208e 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java @@ -16,7 +16,7 @@ public class UpdateViewTimeFormDTO implements Serializable { private static final long serialVersionUID = 7104400078458366322L; - public interface UpdateViewTimeForm extends CustomerClientShowGroup{} + public interface UpdateViewTimeForm{} /** * 居民端用户:resi_user；工作人员:staff diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java new file mode 100644 index 0000000000..f5b744289e --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/8/3 11:07 上午 + * @DESC + */ +@Data +public class ReplyListResultDTO implements Serializable { + + private static final long serialVersionUID = 4875335642497226847L; + + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java index a8d2fba48f..6a1eac37ef 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java @@ -17,11 +17,19 @@ package com.epmet.controller; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.ReplyListFormDTO; +import com.epmet.dto.result.ReplyListResultDTO; import com.epmet.service.ResiEventReplyService; 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; + /** * 事件回复表 @@ -36,5 +44,16 @@ public class ResiEventReplyController { @Autowired private ResiEventReplyService resiEventReplyService; + /** + * @Description 报事详情-回复列表-两端通用 + * @Param formDTO + * @author zxc + * @date 2021/8/3 11:11 上午 + */ + @PostMapping("list") + public Result> replyList(@RequestBody ReplyListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, ReplyListFormDTO.ReplyListForm.class); + return new Result>().ok(resiEventReplyService.replyList(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java index 49137c1053..5065a9eb79 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java @@ -18,7 +18,12 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.form.ReplyListFormDTO; +import com.epmet.dto.result.ReplyListResultDTO; import com.epmet.entity.ResiEventReplyEntity; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; /** * 事件回复表 @@ -28,4 +33,12 @@ import com.epmet.entity.ResiEventReplyEntity; */ public interface ResiEventReplyService extends BaseService { + /** + * @Description 报事详情-回复列表-两端通用 + * @Param formDTO + * @author zxc + * @date 2021/8/3 11:11 上午 + */ + List replyList(ReplyListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java index e042cd3acc..4b003cf048 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java @@ -19,10 +19,14 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.dao.ResiEventReplyDao; +import com.epmet.dto.form.ReplyListFormDTO; +import com.epmet.dto.result.ReplyListResultDTO; import com.epmet.entity.ResiEventReplyEntity; import com.epmet.service.ResiEventReplyService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 事件回复表 * @@ -32,5 +36,14 @@ import org.springframework.stereotype.Service; @Service public class ResiEventReplyServiceImpl extends BaseServiceImpl implements ResiEventReplyService { - + /** + * @Description 报事详情-回复列表-两端通用 + * @Param formDTO + * @author zxc + * @date 2021/8/3 11:11 上午 + */ + @Override + public List replyList(ReplyListFormDTO formDTO) { + return null; + } } \ No newline at end of file From cc7b6d4a2d15785c9a7d6be5525d8e6ae5728692 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 3 Aug 2021 13:48:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/EventProjectInfoDTO.java | 43 ++++++++++ .../epmet/dto/form/EventDetailFormDTO.java | 22 +++++ .../dto/result/EventDetailResultDTO.java | 82 +++++++++++++++++++ .../epmet/controller/ResiEventController.java | 17 ++++ .../com/epmet/service/ResiEventService.java | 11 ++- .../service/impl/ResiEventServiceImpl.java | 13 +++ 6 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java new file mode 100644 index 0000000000..b8de802fe0 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java @@ -0,0 +1,43 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/8/3 1:38 下午 + * @DESC + */ +@Data +public class EventProjectInfoDTO implements Serializable { + + private static final long serialVersionUID = 5622220354099001615L; + + /** + * 项目ID + */ + private String projectId; + + /** + * 操作人【xxx社区-张三】 + */ + private String operationName; + + /** + * 操作时间 + */ + private String operationTime; + + /** + * 报事说明 + */ + private String projectDeclare; + + public EventProjectInfoDTO() { + this.projectId = ""; + this.operationName = ""; + this.operationTime = ""; + this.projectDeclare = ""; + } +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java new file mode 100644 index 0000000000..1d2972d0c3 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/8/3 1:27 下午 + * @DESC + */ +@Data +public class EventDetailFormDTO implements Serializable { + + private static final long serialVersionUID = -297495947153154171L; + + public interface EventDetailForm{} + + @NotBlank(message = "报事ID不能为空",groups = EventDetailForm.class) + private String eventId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java new file mode 100644 index 0000000000..85e0a0a9b2 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java @@ -0,0 +1,82 @@ +package com.epmet.dto.result; + +import com.epmet.dto.EventProjectInfoDTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2021/8/3 1:30 下午 + * @DESC + */ +@Data +public class EventDetailResultDTO implements Serializable { + + private static final long serialVersionUID = 3905105043326445613L; + + /** + * 报事时间 + */ + private String eventTime; + + /** + * 报事内容 + */ + private String eventContent; + + /** + * 报事地址 + */ + private String eventAddress; + + /** + * 所属网格【xx社区-xx网格】 + */ + private String gridName; + + /** + * 是否办结【是：true，否：false】 + */ + private Boolean isClosed; + + /** + * 是否解决【是：true，否：false】 + */ + private Boolean isResolve; + + /** + * 是否可以撤回【true：是，false：否】 + */ + private Boolean isRollback; + + /** + * 报事图片 + */ + private List eventImgs; + + /** + * 报事提到的人 + */ + private List eventPerson; + + /** + * 项目信息 + */ + private EventProjectInfoDTO projectInfo; + + public EventDetailResultDTO() { + this.eventTime = ""; + this.eventContent = ""; + this.eventAddress = ""; + this.gridName = ""; + this.isClosed = false; + this.isResolve = false; + this.isRollback = false; + this.eventImgs = new ArrayList<>(); + this.eventPerson = new ArrayList<>(); + this.projectInfo = new EventProjectInfoDTO(); + } +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index 9352700c88..e97ee03e78 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -17,8 +17,14 @@ package com.epmet.controller; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.EventDetailFormDTO; +import com.epmet.dto.result.EventDetailResultDTO; import com.epmet.service.ResiEventService; 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; @@ -36,5 +42,16 @@ public class ResiEventController { @Autowired private ResiEventService resiEventService; + /** + * @Description 报事详情-两端通用 + * @Param formDTO + * @author zxc + * @date 2021/8/3 1:47 下午 + */ + @PostMapping("eventdetail") + public Result eventDetail(@RequestBody EventDetailFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO); + return new Result().ok(resiEventService.eventDetail(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java index fec1527d3c..8606c1c59f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java @@ -1,11 +1,12 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.form.EventDetailFormDTO; import com.epmet.dto.form.EventListFormDTO; import com.epmet.dto.form.UpdateViewTimeFormDTO; +import com.epmet.dto.result.EventDetailResultDTO; import com.epmet.dto.result.EventListResultDTO; import com.epmet.entity.ResiEventEntity; -import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -33,4 +34,12 @@ public interface ResiEventService extends BaseService { */ void updateViewTime(UpdateViewTimeFormDTO formDTO); + /** + * @Description 报事详情-两端通用 + * @Param formDTO + * @author zxc + * @date 2021/8/3 1:47 下午 + */ + EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index a3b5e3cd81..1697e07a84 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -19,8 +19,10 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.dao.ResiEventDao; +import com.epmet.dto.form.EventDetailFormDTO; import com.epmet.dto.form.EventListFormDTO; import com.epmet.dto.form.UpdateViewTimeFormDTO; +import com.epmet.dto.result.EventDetailResultDTO; import com.epmet.dto.result.EventListResultDTO; import com.epmet.entity.ResiEventEntity; import com.epmet.service.ResiEventService; @@ -58,4 +60,15 @@ public class ResiEventServiceImpl extends BaseServiceImpl