Merge branch 'dev_resi_event' into develop

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -97,6 +97,7 @@ public enum EpmetErrorCode {
 	VOTE_ISSUE_PLEASE(8602,"请先选择支持或反对，再发表您的想法"),
 	RESI_EVENT_READ(8603,"当前事件正在处理中,不能撤回"),
 	RESI_EVENT_NOT_MY_REPORTED(8604,"当前事件不是您发布的，无权操作"),
+	CAN_NOT_REPLY_RESI_EVENT(8605,"办结、立项处理后不可回复"),
 
 	// 爱心互助 居民端
     NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"),

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyFormDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 回复通用入参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/4 14:16
+ */
+@Data
+public class ReplyFormDTO implements Serializable {
+    private static final long serialVersionUID = 1653042839040178697L;
+    public interface AddUserInternalGroup {
+    }
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+    @NotBlank(message = "事件id不能为空",groups = AddUserInternalGroup.class)
+    private String resiEventId;
+    @Length(min = 1, max = 200, message = "请填写回复内容,最多输入200字", groups = AddUserShowGroup.class)
+    private String content;
+
+    //以下参数从token中获取
+    /**
+     * 当前用户id
+     */
+    @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class)
+    private String userId;
+}

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

@@ -21,6 +21,7 @@ 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.dto.form.ReplyFormDTO;
 import com.epmet.dto.form.ReplyListFormDTO;
 import com.epmet.dto.result.ReplyListResultDTO;
 import com.epmet.service.ResiEventReplyService;
@@ -59,4 +60,20 @@ public class ResiEventReplyController {
         return new Result<List<ReplyListResultDTO>>().ok(resiEventReplyService.replyList(formDTO));
     }
 
+    /**
+     * 报事-工作人员回复
+     * 
+     * @param tokenDto
+     * @param replyFormDTO 
+     * @return  com.epmet.commons.tools.utils.Result 
+     * @author yinzuomei 
+     * @date 2021/8/4 14:19
+     */
+    @PostMapping("govReply")
+    public Result govReply(@LoginUser TokenDto tokenDto,@RequestBody ReplyFormDTO replyFormDTO){
+        replyFormDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(replyFormDTO,ReplyFormDTO.AddUserShowGroup.class,ReplyFormDTO.AddUserInternalGroup.class);
+        resiEventReplyService.govReply(replyFormDTO);
+        return new Result();
+    }
 }

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

@@ -18,10 +18,10 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.form.ReplyFormDTO;
 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;
 
@@ -41,4 +41,13 @@ public interface ResiEventReplyService extends BaseService<ResiEventReplyEntity>
      */
     List<ReplyListResultDTO> replyList(ReplyListFormDTO formDTO);
 
+    /**
+     * 报事-工作人员回复
+     *
+     * @param replyFormDTO
+     * @return  void
+     * @author yinzuomei
+     * @date 2021/8/4 14:20
+     */
+    void govReply(ReplyFormDTO replyFormDTO);
 }

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

@@ -18,14 +18,36 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.scan.param.TextScanParamDTO;
+import com.epmet.commons.tools.scan.param.TextTaskDTO;
+import com.epmet.commons.tools.scan.result.SyncScanResult;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.ScanContentUtils;
+import com.epmet.constant.EventConstant;
+import com.epmet.constant.ResiEventAction;
+import com.epmet.dao.ResiEventDao;
+import com.epmet.dao.ResiEventOperationLogDao;
 import com.epmet.dao.ResiEventReplyDao;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.form.ReplyFormDTO;
 import com.epmet.dto.form.ReplyListFormDTO;
 import com.epmet.dto.result.ReplyListResultDTO;
+import com.epmet.entity.ResiEventEntity;
+import com.epmet.entity.ResiEventOperationLogEntity;
 import com.epmet.entity.ResiEventReplyEntity;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.ResiEventReplyService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * 事件回复表
@@ -35,6 +57,16 @@ import java.util.List;
  */
 @Service
 public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao, ResiEventReplyEntity> implements ResiEventReplyService {
+    @Autowired
+    private ResiEventDao resiEventDao;
+    @Autowired
+    private ResiEventOperationLogDao resiEventOperationLogDao;
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Value("${openapi.scan.server.url}")
+    private String scanApiUrl;
+    @Value("${openapi.scan.method.textSyncScan}")
+    private String textSyncScanMethod;
 
     /**
      * @Description  报事详情-回复列表-两端通用
@@ -52,4 +84,67 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         });
         return list;
     }
+
+    /**
+     * 报事-工作人员回复:办结、立项处理后不可回复
+     *
+     * @param replyFormDTO
+     * @return void
+     * @author yinzuomei
+     * @date 2021/8/4 14:20
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void govReply(ReplyFormDTO replyFormDTO) {
+        ResiEventEntity eventEntity=resiEventDao.selectById(replyFormDTO.getResiEventId());
+        // 办结、立项处理后不可回复
+        if(EventConstant.EVENT_STATUS_CLOSED_CASE.equals(eventEntity.getStatus())||eventEntity.getShiftProject()){
+            throw new RenException(EpmetErrorCode.CAN_NOT_REPLY_RESI_EVENT.getCode(),EpmetErrorCode.CAN_NOT_REPLY_RESI_EVENT.getMsg());
+        }
+        // 回复内容走审核
+        scanReplyContent(replyFormDTO.getContent());
+        //查询工作人员所属组织
+        Result<CustomerAgencyDTO> staffResult = govOrgOpenFeignClient.getAgencyByStaff(replyFormDTO.getUserId());
+        if (!staffResult.success() && null == staffResult.getData()) {
+            throw new RenException("查询当前工作人员信息异常");
+        }
+        // 插入回复表
+        ResiEventReplyEntity resiEventReplyEntity=new ResiEventReplyEntity();
+        resiEventReplyEntity.setCustomerId(eventEntity.getCustomerId());
+        resiEventReplyEntity.setResiEventId(replyFormDTO.getResiEventId());
+        resiEventReplyEntity.setFromUserId(replyFormDTO.getUserId());
+        resiEventReplyEntity.setContent(replyFormDTO.getContent());
+        resiEventReplyEntity.setUserShowName(staffResult.getData().getOrganizationName());
+        resiEventReplyEntity.setCreatedTime(new Date());
+        baseDao.insert(resiEventReplyEntity);
+        // 记录操作日志
+        //2、插入log日志
+        ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity();
+        reCallLog.setCustomerId(eventEntity.getCustomerId());
+        reCallLog.setResiEventId(eventEntity.getId());
+        reCallLog.setUserId(replyFormDTO.getUserId());
+        reCallLog.setUserIdentity(EventConstant.STAFF);
+        reCallLog.setActionCode(ResiEventAction.REPLY.getCode());
+        reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc());
+        reCallLog.setOperateTime(resiEventReplyEntity.getCreatedTime());
+        resiEventOperationLogDao.insert(reCallLog);
+    }
+
+    private void scanReplyContent(String content) {
+        if (StringUtils.isNotBlank(content)) {
+            TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+            TextTaskDTO taskDTO = new TextTaskDTO();
+            taskDTO.setContent(content);
+            taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+            textScanParamDTO.getTasks().add(taskDTO);
+            Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+            if (!textSyncScanResult.success()) {
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            } else {
+                if (!textSyncScanResult.getData().isAllPass()) {
+                    throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg());
+                }
+            }
+        }
+    }
 }

epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java

@@ -9,5 +9,5 @@ import lombok.Data;
 */
 @Data
 public class ResiEventNpcListFormDTO {
-    private String gridId;
+    private String customerId;
 }

epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java

@@ -20,8 +20,16 @@ public class ResiEventNpcResultDTO {
 
     private String gridId;
 
+    /**
+     * 展示名
+     */
     private String displayName;
 
+    /**
+     * 真实姓名
+     */
+    private String userShowName;
+
     private String headImgUrl;
 
     private String agencyId;

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java

@@ -32,15 +32,15 @@ public class ResiEventController {
 
     /**
      * @return
-     * @Description 查询人大代表列表
+     * @Description 查询人大代表列表(客户下的)
      * @author wxz
      * @date 2021.08.03 09:17
      */
-    @PostMapping("/npc-list-ingrid")
+    @PostMapping("/npc-list")
     public Result<HashMap<String, List<ResiEventNpcResultDTO>>> listNpc(@RequestBody ResiEventNpcListFormDTO input) {
         ValidatorUtils.validateEntity(input);
-        String gridId = input.getGridId();
+        String customerId = input.getCustomerId();
-        List<ResiEventNpcResultDTO> npcs = resiEventService.listNpcByGrid(gridId);
+        List<ResiEventNpcResultDTO> npcs = resiEventService.listNpcByGrid(customerId);
 
         HashMap<String, List<ResiEventNpcResultDTO>> wrapper = new HashMap<>();
         wrapper.put("reportTargets", npcs);

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java

@@ -18,7 +18,7 @@ public interface ResiEventService {
      * @author wxz
      * @date 2021.08.03 09:29
     */
-    List<ResiEventNpcResultDTO> listNpcByGrid(String gridId);
+    List<ResiEventNpcResultDTO> listNpcByGrid(String customerId);
 
     /**
      * @Description 查询上报目标列表

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -36,29 +36,62 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     @Override
-    public List<ResiEventNpcResultDTO> listNpcByGrid(String gridId) {
+    public List<ResiEventNpcResultDTO> listNpcByGrid(String customerId) {
 
         // 查询网格所属的组织信息
-        Result<GridInfoResultDTO> gridInfoResult = govOrgOpenFeignClient.queryGridInfo(gridId);
+        //Result<GridInfoResultDTO> gridInfoResult = govOrgOpenFeignClient.queryGridInfo(customerId);
-        GridInfoResultDTO gridInfoData = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null);
+        //GridInfoResultDTO gridInfoData = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null);
-        String parentAgencyId = gridInfoData.getParentAgencyId();
+        //String parentAgencyId = gridInfoData.getParentAgencyId();
-        String pids = gridInfoData.getPids();
+        //String pids = gridInfoData.getPids();
 
         //查询人大代表列表
-        ListUserByBadgeFormDTO npcForm = new ListUserByBadgeFormDTO(gridId, BadgeConstant.BADGE_KEY_NPC);
+        ListUserByBadgeFormDTO npcForm = new ListUserByBadgeFormDTO(customerId, 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, pids))
+        List<String> npcGridIds = npcData.stream().map(d -> d.getGridId()).collect(Collectors.toList());
-                .collect(Collectors.toList());
+        OrgInfoFormDTO form = new OrgInfoFormDTO(OrgInfoConstant.GRID, npcGridIds);
+        Result<List<OrgInfoResultDTO>> npcGridInfoResult = govOrgOpenFeignClient.selectOrgInfo(form);
+        List<OrgInfoResultDTO> npcGridInfos = getResultDataOrThrowsException(npcGridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null);
+
+        Map<String, OrgInfoResultDTO> npcGridInfoMap = convertNpcGridInfos2Map(npcGridInfos);
+
+        List<ResiEventNpcResultDTO> npcResultList = new ArrayList<>();
+        npcData.stream().forEach(npc -> {
+                    OrgInfoResultDTO gridInfo = npcGridInfoMap.get(npc.getGridId());
+                    ResiEventNpcResultDTO resiEventNpcInfo = new ResiEventNpcResultDTO(
+                            npc.getUserId(),
+                            npc.getGridId(),
+                            "人大代表-".concat(npc.getRealName()),
+                            npc.getRealName(),
+                            npc.getHeadImgUrl(),
+                            gridInfo != null ? gridInfo.getAgencyId() : null,
+                            gridInfo != null ? gridInfo.getPids().concat(":").concat(gridInfo.getAgencyId()) : null);
+                    npcResultList.add(resiEventNpcInfo);
+                }
+        );
 
         return npcResultList;
     }
 
     /**
-     * @Description 此处会调用org上游接口批量获取父级组织信息，由于上游接口排序不可控，因此此处需要使用TreeSet做排序
      * @return
+     * @Description 将网格信息转化为map
+     * @author wxz
+     * @date 2021.08.04 14:25
+     */
+    private Map<String, OrgInfoResultDTO> convertNpcGridInfos2Map(List<OrgInfoResultDTO> npcGridInfos) {
+        HashMap<String, OrgInfoResultDTO> result = new HashMap<>();
+        npcGridInfos.stream().forEach(i -> {
+            result.put(i.getOrgId(), i);
+        });
+        return result;
+    }
+
+    /**
+     * @return
+     * @Description 此处会调用org上游接口批量获取父级组织信息，由于上游接口排序不可控，因此此处需要使用TreeSet做排序
      * @author wxz
      * @date 2021.08.03 15:51
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java

@@ -11,10 +11,9 @@ import javax.validation.constraints.NotBlank;
 @NoArgsConstructor
 public class ListUserByBadgeFormDTO {
 
-    @NotBlank(message = "网格ID不能为空")
+    @NotBlank(message = "客户ID不能为空")
-    private String gridId;
+    private String customerId;
 
     @NotBlank(message = "徽章key不能为空")
     private String badgeKey;
-
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java

@@ -199,10 +199,10 @@ public class BadgeController {
 	public Result<List<ListUserByBadgeResultDTO>> listUsersByBadge(@RequestBody ListUserByBadgeFormDTO input) {
 		ValidatorUtils.validateEntity(input);
 
-		String gridId = input.getGridId();
+		String customerId = input.getCustomerId();
 		String badgeKey = input.getBadgeKey();
 
-		List<ListUserByBadgeResultDTO> users = badgeService.listUsersByBadge(gridId, badgeKey);
+		List<ListUserByBadgeResultDTO> users = badgeService.listUsersByBadge(customerId, badgeKey);
 		return new Result<List<ListUserByBadgeResultDTO>>().ok(users);
 	}
 }

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

@@ -203,5 +203,5 @@ public interface BadgeDao extends BaseDao<BadgeEntity> {
 	 * @author wxz
 	 * @date 2021.08.02 10:40
 	*/
-    List<ListUserByBadgeResultDTO> listUsersByBadge(@Param("gridId") String gridId, @Param("badgeKey") String badgeKey);
+    List<ListUserByBadgeResultDTO> listUsersByBadge(@Param("customerId") String customerId, @Param("badgeKey") String badgeKey);
 }

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

@@ -199,5 +199,5 @@ public interface BadgeService extends BaseService<BadgeEntity> {
      * @author wxz
      * @date 2021.08.02 10:39
     */
-    List<ListUserByBadgeResultDTO> listUsersByBadge(String gridId, String badgeKey);
+    List<ListUserByBadgeResultDTO> listUsersByBadge(String customerId, String badgeKey);
 }

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

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

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

@@ -320,7 +320,7 @@
             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.CUSTOMER_ID=#{customerId}
                                     and resi_user_badge.CERTIFICATION_AUTID_STATUS = 'approved'
                                     and resi_user_badge.DEL_FLAG = 0
                                     and resi_user_badge.BADGE_ID = badge.ID