Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event

# Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

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
      */

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 = "";
+    }
+}

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;
+}

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{}
+
+    /**
+     * 报事列表类型【已处理：processed 	未处理：undisposed 	已办结：transferred】
+     */
+    @NotBlank(message = "报事列表类型不能为空",groups = EventListForm.class)
+    private String eventType;
+
+    @NotBlank(message = "",groups = EventListForm.class)
+    private String orgId;
+}

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;
+}

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{}
+
+    /**
+     * 居民端用户:resi_user；工作人员:staff
+     */
+    @NotBlank(message = "viewType不能为空",groups = UpdateViewTimeForm.class)
+    private String viewType;
+
+    @NotBlank(message = "事件ID不能为空",groups = UpdateViewTimeForm.class)
+    private String eventId;
+}

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<String> eventImgs;
+
+    /**
+     * 报事提到的人
+     */
+    private List<String> 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();
+    }
+}

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<String> eventImgs;
+
+}

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;
+
+
+}

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<List<EventListResultDTO>> eventList(@RequestBody EventListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, EventListFormDTO.EventListForm.class);
+        return new Result<List<EventListResultDTO>>().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();
+    }
+
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java

@@ -17,6 +17,10 @@
 
 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.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -50,6 +54,17 @@ public class ResiEventController {
     @Autowired
     private ResiEventService resiEventService;
 
+    /**
+     * @Description  报事详情-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 1:47 下午
+     */
+    @PostMapping("eventdetail")
+    public Result<EventDetailResultDTO> eventDetail(@RequestBody EventDetailFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<EventDetailResultDTO>().ok(resiEventService.eventDetail(formDTO));
+    }
     /**
      * 我要报事-提交（尹）
      *
@@ -68,10 +83,10 @@ public class ResiEventController {
 
     /**
      * 我要报事-撤回（尹）
-     * 
-     * @param formDTO 
-     * @return  com.epmet.commons.tools.utils.Result 
-     * @author yinzuomei 
+     *
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
      * @date 2021/8/3 10:54
      */
     @PostMapping("recall")
@@ -104,11 +119,11 @@ public class ResiEventController {
 
     /**
      * 我的报事列表查询
-     * 
+     *
      * @param tokenDto
-     * @param formDTO 
-     * @return  com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.MyReportedResultDTO>> 
-     * @author yinzuomei 
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.MyReportedResultDTO>>
+     * @author yinzuomei
      * @date 2021/8/3 14:27
      */
     @PostMapping("myreported")

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<List<ReplyListResultDTO>> replyList(@RequestBody ReplyListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, ReplyListFormDTO.ReplyListForm.class);
+        return new Result<List<ReplyListResultDTO>>().ok(resiEventReplyService.replyList(formDTO));
+    }
 
 }

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<ResiEventReplyEntity> {
 
+    /**
+     * @Description  报事详情-回复列表-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:11 上午
+     */
+    List<ReplyListResultDTO> replyList(ReplyListFormDTO formDTO);
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java

@@ -1,32 +1,13 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * 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.
- * <p>
- * 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.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.ResiEventEntity;
 import com.epmet.dto.form.ChooseResolveFormDTO;
 import com.epmet.dto.form.MyReportedFormDTO;
 import com.epmet.dto.form.ReCallEventFormDTO;
 import com.epmet.dto.form.ResiEventFormDTO;
 import com.epmet.dto.result.MyReportedResultDTO;
 import com.epmet.dto.result.ResiEventIdDTO;
-import com.epmet.entity.ResiEventEntity;
-
-import java.util.List;
 
 /**
  * 居民报事表
@@ -35,6 +16,31 @@ import java.util.List;
  * @since v1.0.0 2021-08-03
  */
 public interface ResiEventService extends BaseService<ResiEventEntity> {
+
+    /**
+     * @Description  群众直报（待处理、处理中、已办结）列表
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 10:53 上午
+     */
+    List<EventListResultDTO> eventList(EventListFormDTO formDTO);
+
+    /**
+     * @Description  查看报事时,更新时间操作
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:01 上午
+     */
+    void updateViewTime(UpdateViewTimeFormDTO formDTO);
+
+    /**
+     * @Description  报事详情-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 1:47 下午
+     */
+    EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO);
+
     /**
      * 我要报事-提交（尹）
      *

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<ResiEventReplyDao, ResiEventReplyEntity> implements ResiEventReplyService {
 
-
+    /**
+     * @Description  报事详情-回复列表-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:11 上午
+     */
+    @Override
+    public List<ReplyListResultDTO> replyList(ReplyListFormDTO formDTO) {
+        return null;
+    }
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -19,6 +19,11 @@ 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.dto.form.ChooseResolveFormDTO;
 import com.epmet.dto.form.MyReportedFormDTO;
 import com.epmet.dto.form.ReCallEventFormDTO;
@@ -40,7 +45,38 @@ import java.util.List;
 @Service
 public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEventEntity> implements ResiEventService {
 
+    /**
+     * @Description  群众直报（待处理、处理中、已办结）列表
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 10:53 上午
+     */
+    @Override
+    public List<EventListResultDTO> eventList(EventListFormDTO formDTO) {
+        return null;
+    }
+
+    /**
+     * @Description  查看报事时,更新时间操作
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:01 上午
+     */
+    @Override
+    public void updateViewTime(UpdateViewTimeFormDTO formDTO) {
+
+    }
 
+    /**
+     * @Description  报事详情-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 1:47 下午
+     */
+    @Override
+    public EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO) {
+        return null;
+    }
     /**
      * 我要报事-提交（尹）
      *

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;
+}

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;
+}

epmet-module/resi-home/resi-home-server/pom.xml

@@ -68,6 +68,16 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-org-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
 
     </dependencies>
 

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<List<ResiEventNpcResultDTO>> listNpc(@RequestBody ResiEventNpcListFormDTO input) {
+        ValidatorUtils.validateEntity(input);
+        String gridId = input.getGridId();
+        List<ResiEventNpcResultDTO> npcs = resiEventService.listNpcByGrid(gridId);
+        return new Result<List<ResiEventNpcResultDTO>>().ok(npcs);
+    }
 
 }

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<ResiEventNpcResultDTO> listNpcByGrid(String gridId);
 }

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<ResiEventNpcResultDTO> listNpcByGrid(String gridId) {
+
+        // 查询网格所属的组织信息
+        Result<GridInfoResultDTO> 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<List<ListUserByBadgeResultDTO>> npcResult = epmetUserOpenFeignClient.listUsersByBadge(npcForm);
+        List<ListUserByBadgeResultDTO> npcData = getResultDataOrThrowsException(npcResult, ServiceConstant.EPMET_USER_SERVER, null, null);
+
+        List<ResiEventNpcResultDTO> npcResultList = npcData.stream()
+                .map(npc -> new ResiEventNpcResultDTO(npc.getUserId(), gridId, "人大代表-".concat(npc.getRealName()), npc.getHeadImgUrl(), parentAgencyId))
+                .collect(Collectors.toList());
+
+        return npcResultList;
+    }
 }

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";
+
 }

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;
+
+}

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;
+}

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<List<ListUserByBadgeResultDTO>> listUsersByBadge(ListUserByBadgeFormDTO input);
 }

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<List<ListUserByBadgeResultDTO>> listUsersByBadge(ListUserByBadgeFormDTO input) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listUsersByBadge", input);
+    }
 }

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<List<UserBadgesResultDTO>> userBadges(@RequestBody UserBadgesFormDTO formDTO){
 		return new Result<List<UserBadgesResultDTO>>().ok(badgeService.userBadges(formDTO));
 	}
+
+	/**
+	 * @Description
+	 * @return    
+	 * @author wxz
+	 * @date 2021.08.02 10:27
+	*/
+	@PostMapping("list-users-by-badge")
+	public Result<List<ListUserByBadgeResultDTO>> listUsersByBadge(@RequestBody ListUserByBadgeFormDTO input) {
+		ValidatorUtils.validateEntity(input);
+
+		String gridId = input.getGridId();
+		String badgeKey = input.getBadgeKey();
+
+		List<ListUserByBadgeResultDTO> users = badgeService.listUsersByBadge(gridId, badgeKey);
+		return new Result<List<ListUserByBadgeResultDTO>>().ok(users);
+	}
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java

@@ -196,4 +196,12 @@ public interface BadgeDao extends BaseDao<BadgeEntity> {
 	 * @date 2020/11/19 10:18 上午
 	 */
 	int selectNextSort(@Param("customerId") String customerId);
+
+	/**
+	 * @Description 根据徽章查询人列表
+	 * @return
+	 * @author wxz
+	 * @date 2021.08.02 10:40
+	*/
+    List<ListUserByBadgeResultDTO> listUsersByBadge(@Param("gridId") String gridId, @Param("badgeKey") String badgeKey);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java

@@ -192,4 +192,12 @@ public interface BadgeService extends BaseService<BadgeEntity> {
      * @date 2021/4/22 下午4:17
      */
     List<UserBadgesResultDTO> userBadges(UserBadgesFormDTO formDTO);
+
+    /**
+     * @Description 根据徽章查询用户列表
+     * @return
+     * @author wxz
+     * @date 2021.08.02 10:39
+    */
+    List<ListUserByBadgeResultDTO> listUsersByBadge(String gridId, String badgeKey);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java

@@ -480,4 +480,8 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
         return result;
     }
 
+    @Override
+    public List<ListUserByBadgeResultDTO> listUsersByBadge(String gridId, String badgeKey) {
+        return baseDao.listUsersByBadge(gridId, badgeKey);
+    }
 }

epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml

@@ -310,4 +310,24 @@
         ORDER BY CREATED_TIME DESC
         LIMIT 1
     </select>
+
+    <!--根据徽章查询居民列表-->
+    <select id="listUsersByBadge" resultType="com.epmet.dto.result.ListUserByBadgeResultDTO">
+        select
+            resi_user_badge.USER_ID,
+            resi_user_badge.GRID_ID,
+            user_base_info.REAL_NAME,
+            user_base_info.HEAD_IMG_URL
+        from resi_user_badge
+                 inner join badge on (badge.BADGE_KEY = #{badgeKey}
+                                    and resi_user_badge.GRID_ID = #{gridId}
+                                    and resi_user_badge.CERTIFICATION_AUTID_STATUS = 'approved'
+                                    and resi_user_badge.DEL_FLAG = 0
+                                    and resi_user_badge.BADGE_ID = badge.ID
+                                    and badge.DEL_FLAG = 0)
+                 inner join user_base_info
+                            on (user_base_info.USER_ID = resi_user_badge.USER_ID
+                            and user_base_info.DEL_FLAG = 0)
+
+    </select>
 </mapper>