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

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java

@@ -28,5 +28,10 @@ public class VoteFormDTO implements Serializable {
      */
     private String createdBy;
 
+    /**
+     * 当 sourceType = issue 时，是直接创建议题，无需加入小组即可表决
+     */
+    private String sourceType;
+
 
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java

@@ -334,6 +334,12 @@ public class IssueController {
         return new Result<Boolean>().ok(issueService.issueAuditReset(gridId));
     }
 
+    /**
+     * Desc: 创建议题【直接创建】
+     * @param formDTO
+     * @author zxc
+     * @date 2022/10/8 09:03
+     */
     @PostMapping("createIssue")
     public Result createIssue(@LoginUser TokenDto tokenDto,@RequestBody IssueDTO formDTO){
         formDTO.setUserId(tokenDto.getUserId());

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java

@@ -384,6 +384,12 @@ public interface IssueService extends BaseService<IssueEntity> {
      */
     Boolean issueAuditReset(String gridId);
 
+    /**
+     * Desc: 创建议题【直接创建】
+     * @param issueDTO
+     * @author zxc
+     * @date 2022/10/8 09:03
+     */
     void createIssue(IssueDTO issueDTO);
 
     /**

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -1786,6 +1786,12 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         return false;
     }
 
+    /**
+     * Desc: 创建议题【直接创建】
+     * @param issueDTO
+     * @author zxc
+     * @date 2022/10/8 09:03
+     */
     @Override
     public void createIssue(IssueDTO issueDTO) {
         // 先审核
@@ -1851,6 +1857,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             if (!userResult.success() || CollectionUtils.isEmpty(userResult.getData())){
                 throw new EpmetException("查询居民信息失败");
             }
+            // 议题 议题进程
             issueDTO.setOrgId(gridInfo.getPid());
             issueDTO.setOrgIdPath(gridInfo.getPids());
             IssueEntity e = ConvertUtils.sourceToTarget(issueDTO, IssueEntity.class);
@@ -1873,6 +1880,15 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
     }
 
+    /**
+     * Desc: 附件插入
+     * @param sourceList 附件集合
+     * @param businessId 业务ID
+     * @param attachTo
+     * @param customerId
+     * @author zxc
+     * @date 2022/10/8 09:01
+     */
     private void insertAtt(Collection<?> sourceList,String businessId,String attachTo,String customerId){
         if (CollectionUtils.isNotEmpty(sourceList)){
             List<IssueAttachmentEntity> list = ConvertUtils.sourceToTarget(sourceList, IssueAttachmentEntity.class);

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java

@@ -40,10 +40,12 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.CheckTopicPublisherResultDTO;
 import com.epmet.dto.result.JoinVoteResultDTO;
 import com.epmet.entity.IssueVoteDetailEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.ResiGroupFeignClient;
 import com.epmet.redis.IssueVoteDetailRedis;
 import com.epmet.service.IssueService;
 import com.epmet.service.IssueVoteDetailService;
+import com.epmet.utils.ModuleConstants;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,6 +75,8 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
     private IssueDao issueDao;
     @Autowired
     private IssueVoteStatisticalDao issueVoteStatisticalDao;
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     @Override
     public PageData<IssueVoteDetailDTO> page(Map<String, Object> params) {
@@ -140,7 +144,7 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
         if (redisData==null){
             VoteRedisFormDTO voteRedisFormDTO = new VoteRedisFormDTO();
             voteRedisFormDTO.setIssueId(formDTO.getIssueId());
-            issueVoteDetailRedis.set(voteRedisFormDTO);
+//            issueVoteDetailRedis.set(voteRedisFormDTO);
             redisData = voteRedisFormDTO;
         }
         redisData.setIssueId(formDTO.getIssueId());
@@ -150,17 +154,24 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
             redisData.setOppositionAmount(redisData.getOppositionAmount()+1);
         }
         IssueDTO issueDTO = issueService.get(formDTO.getIssueId());
-//        ShouldVoteCountFormDTO shouldVoteCount = new ShouldVoteCountFormDTO();
-//        shouldVoteCount.setGridId(issueDTO.getGridId());
-//        shouldVoteCount.setIssueCreatedTime(issueDTO.getCreatedTime().getTime()/1000);
-//        ShouldVoteCountResultDTO data = resiGroupFeignClient.shouldVoteCount(shouldVoteCount).getData();
         CommonGridIdFormDTO dto = new CommonGridIdFormDTO();
         dto.setGridId(issueDTO.getGridId());
+        /**
+         * 直接创建议题的，应表决数为网格下的注册居民数
+         */
+        if (formDTO.getSourceType().equals(ModuleConstants.ISSUE)){
+            Result<Integer> allResi = epmetUserOpenFeignClient.getAllResiByGrid(new AllResiByGridFormDTO(issueDTO.getGridId()));
+            if (!allResi.success()){
+                throw new EpmetException("查询网格下的注册居民失败:"+issueDTO.getGridId());
+            }
+            redisData.setShouldVoteCount(allResi.getData());
+        }else {
             Result<Integer> integerResult = resiGroupFeignClient.votableCount(dto);
             if (!integerResult.success()){
                 throw new EpmetException("查询应表决人数失败...");
             }
             redisData.setShouldVoteCount(integerResult.getData());
+        }
         issueVoteDetailRedis.set(redisData);
         Integer checkoutVoteCount = baseDao.checkoutVote(formDTO);
         if (checkoutVoteCount==0){

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java

@@ -16,5 +16,10 @@ public class IssueIdFormDTO implements Serializable {
     @NotBlank(message = "议题id不能为空")
     private String issueId;
 
+    /**
+     * 当 sourceType = issue 时，是直接创建议题，无需加入小组即可表决
+     */
+    private String sourceType;
+
 }
 

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

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/10/8 10:40
+ * @DESC
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AllResiByGridFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 6436906681156592037L;
+
+    public interface AllResiByGridForm{}
+
+    @NotBlank(message = "gridId不能为空",groups = AllResiByGridForm.class)
+    private String gridId;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -924,4 +924,13 @@ public interface EpmetUserOpenFeignClient {
 
     @PostMapping("/epmetuser/dataSyncConfig/natInfoScanTask")
     Result natInfoScanTask(@RequestBody NatInfoScanTaskFormDTO formDTO);
+
+    /**
+     * Desc: 根据网格ID查询所有注册居民
+     * @param formDTO
+     * @author zxc
+     * @date 2022/10/8 10:41
+     */
+    @PostMapping("/epmetuser/resirelation/getAllResiByGrid")
+    Result<Integer> getAllResiByGrid(@RequestBody AllResiByGridFormDTO formDTO);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -716,4 +716,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result natInfoScanTask(NatInfoScanTaskFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "natInfoScanTask", formDTO);
     }
+
+    @Override
+    public Result<Integer> getAllResiByGrid(AllResiByGridFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getAllResiByGrid", formDTO);
+    }
 }

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

@@ -26,6 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.RegisterRelationDTO;
+import com.epmet.dto.form.AllResiByGridFormDTO;
 import com.epmet.dto.form.EnterGridFormDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.excel.RegisterRelationExcel;
@@ -107,4 +108,16 @@ public class RegisterRelationController {
 
         return registerRelationService.getUserInfoAndRoles(enterGridFormDTO);
     }
+
+    /**
+     * Desc: 根据网格ID查询所有注册居民
+     * @param formDTO
+     * @author zxc
+     * @date 2022/10/8 10:41
+     */
+    @PostMapping("getAllResiByGrid")
+    public Result<Integer> getAllResiByGrid(@RequestBody AllResiByGridFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, AllResiByGridFormDTO.AllResiByGridForm.class);
+        return new Result<Integer>().ok(registerRelationService.getAllResiByGrid(formDTO));
+    }
 }

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

@@ -63,4 +63,12 @@ public interface RegisterRelationDao extends BaseDao<RegisterRelationEntity> {
      * @date 2021/12/30 3:14 下午
      */
     RegisterRelationDTO resiRelationInfo(@Param("userId")String userId);
+
+    /**
+     * Desc: 根据网格ID查询所有注册居民
+     * @param gridId
+     * @author zxc
+     * @date 2022/10/8 10:48
+     */
+    Integer getAllResiByGrid(@Param("gridId")String gridId);
 }

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

@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.RegisterRelationDTO;
 import com.epmet.dto.UserResiInfoDTO;
+import com.epmet.dto.form.AllResiByGridFormDTO;
 import com.epmet.dto.form.EnterGridFormDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.entity.RegisterRelationEntity;
@@ -114,4 +115,12 @@ public interface RegisterRelationService extends BaseService<RegisterRelationEnt
     Result saveRegisterRelation(UserResiInfoDTO userResiInfoDTO);
 
     String selectRegisterGridIdByUserId(String userId);
+
+    /**
+     * Desc: 根据网格ID查询所有注册居民
+     * @param formDTO
+     * @author zxc
+     * @date 2022/10/8 10:41
+     */
+    Integer getAllResiByGrid(AllResiByGridFormDTO formDTO);
 }

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

@@ -378,4 +378,15 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         return baseDao.selectRegisterGridIdByUserId(userId);
     }
 
+    /**
+     * Desc: 根据网格ID查询所有注册居民
+     * @param formDTO
+     * @author zxc
+     * @date 2022/10/8 10:41
+     */
+    @Override
+    public Integer getAllResiByGrid(AllResiByGridFormDTO formDTO) {
+        return baseDao.getAllResiByGrid(formDTO.getGridId());
+    }
+
 }

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

@@ -87,5 +87,15 @@
         SELECT * FROM register_relation WHERE DEL_FLAG = 0 AND USER_ID = #{userId}
     </select>
 
+    <!-- 根据网格ID查询所有注册居民 -->
+    <select id="getAllResiByGrid" resultType="java.lang.Integer">
+        SELECT
+            COUNT(DISTINCT USER_ID)
+        FROM register_relation
+        WHERE DEL_FLAG = 0
+          AND FIRST_REGISTER = '1'
+          AND CUSTOMER_ID = #{gridId}
+    </select>
+
 
 </mapper>