补全 项目评价时，添加项目评价统计

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectSatisfactionStatisticsDTO.java

@@ -93,4 +93,9 @@ public class ProjectSatisfactionStatisticsDTO implements Serializable {
      */
     private String customerId;
 
+    /**
+     * 应评价人数【等于实际表决人数】
+     */
+    private Integer shouldEvaluateCount;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectSatisfactionStatisticsEntity.java

@@ -66,4 +66,9 @@ public class ProjectSatisfactionStatisticsEntity extends BaseEpmetEntity {
 	@TableField(fill = FieldFill.INSERT)
 	private String customerId;
 
+	/**
+	 * 应评价人数【等于实际表决人数】
+	 */
+	private Integer shouldEvaluateCount;
+
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java

@@ -309,4 +309,13 @@ public interface GovIssueOpenFeignClient {
 	 **/
 	@PostMapping(value = "/gov/issue/issue/getissuelist")
 	Result<List<IssueDTO>> getIssueList(@RequestParam String customerId);
+
+	/**
+	 * @Description  查询可评价项目人数
+	 * @Param issueId
+	 * @author zxc
+	 * @date 2021/5/12 9:31 上午
+	 */
+	@PostMapping("/gov/issue/issue/canevaluateprojectcount")
+	Result<List<String>> canEvaluateProjectCount(@RequestParam("issueId")String issueId);
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java

@@ -261,4 +261,9 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
 	public Result<List<IssueDTO>> getIssueList(String customerId) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getIssueList", customerId);
 	}
+
+    @Override
+    public Result<List<String>> canEvaluateProjectCount(String issueId) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "canEvaluateProjectCount", issueId);
+    }
 }

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

@@ -256,5 +256,16 @@ public class IssueController {
         return new Result<List<IssueDTO>>().ok(issueService.getIssueList(customerId));
     }
 
+    /**
+     * @Description  查询可评价项目人数
+     * @Param issueId
+     * @author zxc
+     * @date 2021/5/11 4:50 下午
+     */
+    @PostMapping("canevaluateprojectcount")
+    public Result<List<String>> canEvaluateProjectCount(@RequestParam("issueId")String issueId){
+        return new Result<List<String>>().ok(issueService.canEvaluateProjectCount(issueId));
+    }
+
 }
 

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java

@@ -113,4 +113,12 @@ public interface IssueVoteDetailDao extends BaseDao<IssueVoteDetailEntity> {
      * @date 2021.03.18 14:58
     */
     List<VoteRedisFormDTO> selectBatchVoteCount(@Param("issueIds")Set<String> issueIds);
+
+    /**
+     * @Description  查询议题表决数
+     * @Param issueId
+     * @author zxc
+     * @date 2021/5/11 5:15 下午
+     */
+    List<String> selectIssueVoteCount(@Param("issueId")String issueId);
 }

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

@@ -325,4 +325,12 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @date 2021/4/27 10:23 上午
      */
     List<IssueDTO> getIssueList(String customerId);
+
+    /**
+     * @Description  查询可评价项目人数
+     * @Param issueId
+     * @author zxc
+     * @date 2021/5/11 4:50 下午
+     */
+    List<String> canEvaluateProjectCount(String issueId);
 }

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

@@ -27,6 +27,7 @@ import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.IssueDao;
 import com.epmet.dao.IssueProcessDao;
 import com.epmet.dao.IssueProjectRelationDao;
+import com.epmet.dao.IssueVoteDetailDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.IssueAuditionFormDTO;
 import com.epmet.dto.form.IssueShiftedFromTopicFormDTO;
@@ -121,7 +122,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     private IssueTagsService issueTagsService;
     @Autowired
     private IssueProjectTagDictService issueProjectTagDictService;
-
+    @Autowired
+    private IssueVoteDetailDao issueVoteDetailDao;
 
 
 	@Value("${openapi.scan.server.url}")
@@ -1408,4 +1410,34 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         return ConvertUtils.sourceToTarget(issueEntities,IssueDTO.class);
     }
 
+    /**
+     * @Description  查询可评价项目人数
+     * @Param issueId
+     * @author zxc
+     * @date 2021/5/11 4:50 下午
+     */
+    @Override
+    public List<String> canEvaluateProjectCount(String issueId) {
+        List<String> userIds = new ArrayList<>();
+        IssueEntity issueEntity = baseDao.selectById(issueId);
+        if(null == issueEntity){
+            throw new RenException("议题信息不存在");
+        }
+        // 议题创建者
+        userIds.add(issueEntity.getCreatedBy());
+        // 表决过的人
+        List<String> votedCount = issueVoteDetailDao.selectIssueVoteCount(issueId);
+        if (!CollectionUtils.isEmpty(votedCount)){
+            userIds.addAll(votedCount);
+        }
+        // 话题创建者
+        Result<String> topicCreatedUser = resiGroupOpenFeignClient.topicCreatedUser(issueEntity.getSourceId());
+        if (!topicCreatedUser.success()){
+            throw new RenException("【查询话题创建者失败】["+topicCreatedUser.getMsg()+"]");
+        }
+        userIds.add(topicCreatedUser.getData());
+        // 去重
+        return userIds.stream().distinct().collect(Collectors.toList());
+    }
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml

@@ -155,4 +155,14 @@
 
 
     </select>
+
+    <select id="selectIssueVoteCount" resultType="java.lang.String">
+        SELECT
+            CREATED_BY
+        FROM
+            issue_vote_detail
+        WHERE
+            DEL_FLAG = '0'
+          AND ISSUE_ID = #{issueId}
+    </select>
 </mapper>

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

@@ -93,4 +93,9 @@ public class ProjectSatisfactionStatisticsDTO implements Serializable {
      */
     private String customerId;
 
+    /**
+     * 应评价人数【等于实际表决人数】
+     */
+    private Integer shouldEvaluateCount;
+
 }

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

@@ -33,5 +33,10 @@ public class ProjectEvaluateFormDTO implements Serializable {
      */
     private String userId;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java

@@ -174,4 +174,8 @@ public interface ProjectConstant {
 	String NOT_EXIST_PROJECT = "未查询带此项目信息......";
 
 	String EXTERNAL_SYSTEM = "third_platform_project_send";
+
+	String EVALUATE_GOOD = "good";
+	String EVALUATE_BAD = "bad";
+	String EVALUATE_PERFECT = "perfect";
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java

@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.ProjectSatisfactionStatisticsEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 项目满意度调查统计表
@@ -30,4 +31,21 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ProjectSatisfactionStatisticsDao extends BaseDao<ProjectSatisfactionStatisticsEntity> {
 
+    /**
+     * @Description  校验此项目是否存在
+     * @Param projectId
+     * @author zxc
+     * @date 2021/5/10 4:35 下午
+     */
+    Integer checkProjectExists(@Param("projectId")String projectId);
+
+    /**
+     * @Description  更新项目评价数据
+     * @Param projectId
+     * @Param evalType
+     * @author zxc
+     * @date 2021/5/10 4:57 下午
+     */
+    void updateEvaluateData(@Param("projectId")String projectId,@Param("evalType")String evalType,@Param("shouldEvaluateCount")Integer shouldEvaluateCount);
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java

@@ -65,4 +65,9 @@ public class ProjectSatisfactionStatisticsEntity extends BaseEpmetEntity {
 	 */
 	@TableField(fill = FieldFill.INSERT)
 	private String customerId;
+
+	/**
+	 * 应评价人数【等于实际表决人数】
+	 */
+	private Integer shouldEvaluateCount;
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectRedis.java

@@ -17,10 +17,17 @@
 
 package com.epmet.redis;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.dto.form.VoteRedisFormDTO;
+import com.epmet.issue.constant.IssueConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
+import static com.epmet.commons.tools.utils.ConvertUtils.mapToEntity;
+
 /**
  * 项目表
  *
@@ -29,6 +36,9 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class ProjectRedis {
+
+    private final static String issueVoteKey = "epmet:issue:";
+
     @Autowired
     private RedisUtils redisUtils;
 
@@ -44,4 +54,20 @@ public class ProjectRedis {
         return null;
     }
 
+    /**
+     * @Description  获取议题表决详情
+     * @Param issueId
+     * @author zxc
+     * @date 2021/5/11 1:51 下午
+     */
+    public VoteRedisFormDTO getIssueVoteDetail(String issueId){
+        String key = issueVoteKey + issueId;
+        Map<String, Object> stringObjectMap = redisUtils.hGetAll(key);
+        if (stringObjectMap.size()== NumConstant.ZERO || stringObjectMap == null){
+            return new VoteRedisFormDTO();
+        }
+        VoteRedisFormDTO voteRedisFormDTO = mapToEntity(stringObjectMap, VoteRedisFormDTO.class);
+        return voteRedisFormDTO;
+    }
+
 }

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

@@ -20,6 +20,7 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -32,16 +33,23 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ProjectConstant;
+import com.epmet.dao.ProjectDao;
 import com.epmet.dao.ProjectSatisfactionDetailDao;
+import com.epmet.dao.ProjectSatisfactionStatisticsDao;
 import com.epmet.dto.ProjectSatisfactionDetailDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
+import com.epmet.entity.ProjectEntity;
 import com.epmet.entity.ProjectSatisfactionDetailEntity;
+import com.epmet.entity.ProjectSatisfactionStatisticsEntity;
 import com.epmet.feign.EpmetUserFeignClient;
+import com.epmet.feign.GovIssueOpenFeignClient;
+import com.epmet.redis.ProjectRedis;
 import com.epmet.redis.ProjectSatisfactionDetailRedis;
 import com.epmet.service.ProjectSatisfactionDetailService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.redisson.api.RLock;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -69,6 +77,16 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl<Projec
     private String scanApiUrl;
     @Value("${openapi.scan.method.textSyncScan}")
     private String textSyncScanMethod;
+    @Autowired
+    private DistributedLock distributedLock;
+    @Autowired
+    private ProjectSatisfactionStatisticsDao statisticsDao;
+    @Autowired
+    private ProjectDao projectDao;
+    @Autowired
+    private ProjectRedis projectRedis;
+    @Autowired
+    private GovIssueOpenFeignClient govIssueOpenFeignClient;
 
     @Override
     public PageData<ProjectSatisfactionDetailDTO> page(Map<String, Object> params) {
@@ -216,6 +234,58 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl<Projec
             throw new RenException(EpmetErrorCode.ALREADY_EVALUATE.getCode());
         }
         baseDao.insert(entity);
+
+        RLock lock = null;
+        try {
+            lock = distributedLock.getLock("evaluate_project");
+            if (null != lock){
+                ProjectEntity projectEntity = projectDao.selectById(formDTO.getProjectId());
+                if (null == projectEntity){
+                    throw new RenException("未查询到项目信息");
+                }
+                VoteRedisFormDTO issueVoteDetail = projectRedis.getIssueVoteDetail(projectEntity.getOriginId());
+                // 应评价数 = 话题创建者 + 议题发起者 + 议题表决人 【去重】
+                // 议题发起者 和 议题表决人 和 话题创建者 查询
+                Result<List<String>> canEvaluateProjectCount = govIssueOpenFeignClient.canEvaluateProjectCount(projectEntity.getOriginId());
+                if (!canEvaluateProjectCount.success()){
+                    throw new RenException("【查询项目应评价人数失败】，【"+canEvaluateProjectCount.getMsg()+"】");
+                }
+                List<String> userIds = canEvaluateProjectCount.getData();
+                // 校验此项目记录是否存在
+                Integer count = statisticsDao.checkProjectExists(formDTO.getProjectId());
+                if (count == NumConstant.ZERO){
+                    ProjectSatisfactionStatisticsEntity entity1 = new ProjectSatisfactionStatisticsEntity();
+                    entity1.setShouldEvaluateCount(userIds.size());
+                    entity1.setCustomerId(formDTO.getCustomerId());
+                    entity1.setProjectId(formDTO.getProjectId());
+                    entity1.setBadCount(NumConstant.ZERO);
+                    entity1.setGoodCount(NumConstant.ZERO);
+                    entity1.setPerfectCount(NumConstant.ZERO);
+                    switch (formDTO.getSatisfaction()){
+                        case ProjectConstant.EVALUATE_BAD:
+                            entity1.setBadCount(NumConstant.ONE);
+                            break;
+                        case ProjectConstant.EVALUATE_GOOD:
+                            entity1.setGoodCount(NumConstant.ONE);
+                            break;
+                        case ProjectConstant .EVALUATE_PERFECT:
+                            entity1.setPerfectCount(NumConstant.ONE);
+                        default:
+                    }
+                    // 新添一条记录
+                    statisticsDao.insert(entity1);
+                }else {
+                    // 更新
+                    statisticsDao.updateEvaluateData(formDTO.getProjectId(), formDTO.getSatisfaction(),userIds.size());
+                }
+            }
+        }catch (Exception e){
+            throw new RenException(e.getMessage());
+        }finally {
+            if (lock != null){
+                lock.unlock();
+            }
+        }
     }
 
     /**

epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.12__alter_shouldEvaluateCount.sql

@@ -0,0 +1 @@
+ALTER TABLE `project_satisfaction_statistics` ADD `SHOULD_EVALUATE_COUNT` int(11) NOT NULL COMMENT '应评价人数【等于实际表决人数】';

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionStatisticsDao.xml

@@ -3,19 +3,35 @@
 
 <mapper namespace="com.epmet.dao.ProjectSatisfactionStatisticsDao">
 
-    <resultMap type="com.epmet.entity.ProjectSatisfactionStatisticsEntity" id="projectSatisfactionStatisticsMap">
+    <!-- 更新项目评价数据 -->
-        <result property="id" column="ID"/>
+    <update id="updateEvaluateData">
-        <result property="projectId" column="PROJECT_ID"/>
+        UPDATE project_satisfaction_statistics
-        <result property="goodCount" column="GOOD_COUNT"/>
+        SET
-        <result property="perfectCount" column="PERFECT_COUNT"/>
+        <if test="evalType == 'bad' ">
-        <result property="badCount" column="BAD_COUNT"/>
+            BAD_COUNT = BAD_COUNT + 1,
-        <result property="delFlag" column="DEL_FLAG"/>
+        </if>
-        <result property="revision" column="REVISION"/>
+        <if test="evalType == 'good' ">
-        <result property="createdBy" column="CREATED_BY"/>
+            GOOD_COUNT = GOOD_COUNT + 1,
-        <result property="createdTime" column="CREATED_TIME"/>
+        </if>
-        <result property="updatedBy" column="UPDATED_BY"/>
+        <if test="evalType == 'perfect' ">
-        <result property="updatedTime" column="UPDATED_TIME"/>
+            PERFECT_COUNT = PERFECT_COUNT + 1,
-    </resultMap>
+        </if>
+        SHOULD_EVALUATE_COUNT = #{shouldEvaluateCount},
+        UPDATED_TIME = NOW()
+        WHERE DEL_FLAG = '0'
+        AND PROJECT_ID = #{projectId}
+    </update>
+
+    <!-- 校验此项目是否存在 -->
+    <select id="checkProjectExists" resultType="java.lang.Integer">
+        SELECT
+            COUNT( 1 )
+        FROM
+            project_satisfaction_statistics
+        WHERE
+            del_flag = '0'
+          AND PROJECT_ID = #{projectId}
+    </select>
 
 
 </mapper>

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java

@@ -14,10 +14,7 @@ import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.HashMap;
 import java.util.List;
@@ -253,4 +250,13 @@ public interface ResiGroupOpenFeignClient {
      */
     @PostMapping("resi/group/group/groupPointDetail/{groupId}")
     Result<GroupPointDetailResultDTO> groupPointDetail(@PathVariable String groupId);
+
+    /**
+     * @Description  查询话题的创建者
+     * @Param topicId
+     * @author zxc
+     * @date 2021/5/12 9:16 上午
+     */
+    @PostMapping("/resi/group/topic/topiccreateduser")
+    Result<String> topicCreatedUser(@RequestParam("topicId")String topicId);
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java

@@ -198,4 +198,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result<GroupPointDetailResultDTO> groupPointDetail(String groupId) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "groupPointDetail", groupId);
     }
+
+    @Override
+    public Result<String> topicCreatedUser(String topicId) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "topicCreatedUser", topicId);
+    }
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java

@@ -485,4 +485,15 @@ public class ResiTopicController {
         ValidatorUtils.validateEntity(formDTO, GetPastTopicListV2FormDTO.GetPastTopicListV2Form.class);
         return new Result<List<AllMessagesResultDTO>>().ok(topicService.allMessages(formDTO));
     }
+
+    /**
+     * @Description  查询话题的创建者
+     * @Param topicId
+     * @author zxc
+     * @date 2021/5/12 9:16 上午
+     */
+    @PostMapping("topiccreateduser")
+    public Result<String> topicCreatedUser(@RequestParam("topicId")String topicId){
+        return new Result<String>().ok(topicService.topicCreatedUser(topicId));
+    }
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java

@@ -389,4 +389,12 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      * @date 2021/4/28 上午10:41
      */
     List<AllMessagesResultDTO> allMessages(AllMessagesFormDTO formDTO);
+
+    /**
+     * @Description  查询话题的创建者
+     * @Param topicId
+     * @author zxc
+     * @date 2021/5/12 9:16 上午
+     */
+    String topicCreatedUser(String topicId);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -2746,6 +2746,21 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         return allMessages;
     }
 
+    /**
+     * @Description  查询话题的创建者
+     * @Param topicId
+     * @author zxc
+     * @date 2021/5/12 9:16 上午
+     */
+    @Override
+    public String topicCreatedUser(String topicId) {
+        ResiTopicEntity resiTopicEntity = baseDao.selectById(topicId);
+        if (null == resiTopicEntity){
+            throw new RenException("话题信息不存在");
+        }
+        return resiTopicEntity.getCreatedBy();
+    }
+
 }