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

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java

@@ -70,4 +70,8 @@ public interface ConsomerGroupConstants {
      */
     String IC_WARN_STATS_EVENT_LISTENER_GROUP = "ic_warn_stats_event_listener_group";
 
+    /**
+     *  需求完成，如果服务方是区域化党建单位，重新计算这个单位的满意度
+     */
+    String CAL_PARTY_UNIT_SATISFACTION = "cal_party_unit_satisfaction";
 }

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java

@@ -53,4 +53,9 @@ public interface TopicConstants {
      * 项目
      */
     String IC_RESI_USER = "ic_resi_user";
+
+    /**
+     *  需求完成，如果服务方是区域化党建单位，重新计算这个单位的满意度
+     */
+    String CAL_PARTY_UNIT_SATISFACTION = "cal_party_unit_satisfaction";
 }

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/CalPartyUnitSatisfactionFormDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.commons.rocketmq.messages;
+
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ *  需求完成，如果服务方是区域化党建单位，重新计算这个单位的满意度,或者直接计算整个客户
+ */
+@Data
+public class CalPartyUnitSatisfactionFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+    @NotBlank(message = "客户id不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+    private String partyUnitId;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@@ -25,6 +25,7 @@ import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -341,4 +342,15 @@ public interface DataStatisticalOpenFeignClient {
      */
     @PostMapping("/data/stats/datareporting/eventinfo")
     Result<List<EventInfoResultDTO>> getEventInfo(@RequestBody EventInfoFormDTO formDTO);
+
+    /**
+     * wangxianzhang
+     *
+     * 计算客户下志愿者服务相关数据
+     *
+     * @param customerId 客户ID，可以为空，为空则计算所有客户
+     * @return
+     */
+    @PostMapping("/data/stats/demand/volunteer/daily")
+    Result statsVolunteerDemandServicesDaily(@RequestParam(value = "customer-id", required = false) String customerId);
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java

@@ -334,4 +334,9 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
     public Result<List<EventInfoResultDTO>> getEventInfo(EventInfoFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "getEventInfo", formDTO);
     }
+
+    @Override
+    public Result statsVolunteerDemandServicesDaily(String customerId) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "statsVolunteerDemandServicesDaily", customerId);
+    }
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/ServiceStatDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.dto.result.demand;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class ServiceStatDTO implements Serializable {
+    /**
+     * 服务方id
+     */
+    private String serverId;
+    /**
+     * 总分
+     */
+    private BigDecimal totalScore;
+    /**
+     * 服务的需求个数
+     */
+    private Integer demandCount;
+}

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -88,6 +88,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <!--rocketmq-->
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-rocketmq</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -152,6 +158,10 @@
                 <!--测试钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
+                <rocketmq.nameserver>192.168.1.140:9876;192.168.1.141:9876</rocketmq.nameserver>
             </properties>
         </profile>
         <profile>
@@ -195,6 +205,10 @@
                 <!--测试钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.enable>false</rocketmq.enable>
+                <rocketmq.nameserver>192.168.1.140:9876;192.168.1.141:9876</rocketmq.nameserver>
             </properties>
         </profile>
         <profile>
@@ -238,6 +252,10 @@
                 <!--测试钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
+                <rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
             </properties>
         </profile>
         <profile>
@@ -281,6 +299,10 @@
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1</dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java

@@ -17,6 +17,7 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.rocketmq.messages.CalPartyUnitSatisfactionFormDTO;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
@@ -179,4 +180,18 @@ public class IcPartyUnitController {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<List<PartyUnitDistributionResultDTO>>().ok(icPartyUnitService.distribution(formDTO));
     }
+
+
+    /**
+     * 计算区域化党建单位的群众满意度
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("cal-partyunit-satisfation")
+    public Result calPartyUnitSatisfation(@RequestBody CalPartyUnitSatisfactionFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,CalPartyUnitSatisfactionFormDTO.AddUserInternalGroup.class);
+        icPartyUnitService.calPartyUnitSatisfation(formDTO);
+        return new Result();
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java

@@ -25,6 +25,7 @@ import com.epmet.entity.IcPartyUnitEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -63,4 +64,6 @@ public interface IcPartyUnitDao extends BaseDao<IcPartyUnitEntity> {
      * @Date 2021/12/9 14:24
      */
     List<PartyUnitDistributionResultDTO> getDistribution(@Param("agencyId")String agencyId);
+
+    int updateSatisfaction(@Param("partyUnitId") String serverId, @Param("satisfaction") BigDecimal satisfaction);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java

@@ -22,6 +22,9 @@ import com.epmet.dto.form.demand.IcResiUserDemandFromDTO;
 import com.epmet.dto.form.demand.PageListAnalysisFormDTO;
 import com.epmet.dto.form.demand.UserDemandPageFormDTO;
 import com.epmet.dto.result.demand.*;
+import com.epmet.dto.result.demand.DemandRecResultDTO;
+import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
+import com.epmet.dto.result.demand.ServiceStatDTO;
 import com.epmet.entity.IcUserDemandRecEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -81,4 +84,6 @@ public interface IcUserDemandRecDao extends BaseDao<IcUserDemandRecEntity> {
                                                             @Param("gridPids") String gridPids,
                                                             @Param("startDateId") String startDateId,
                                                             @Param("endDateId") String endDateId);
+
+    List<ServiceStatDTO> selectGroupByPartyUnit(@Param("customerId") String customerId, @Param("partyUnitId") String partyUnitId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java

@@ -0,0 +1,31 @@
+package com.epmet.mq;
+
+import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
+import com.epmet.commons.rocketmq.constants.TopicConstants;
+import com.epmet.commons.rocketmq.register.MQAbstractRegister;
+import com.epmet.commons.rocketmq.register.MQConsumerProperties;
+import com.epmet.mq.listener.PartyUnitSatisfactionCalEventListener;
+import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 如果rocketmq.enable=true，这里必须实现，且 实例化
+ * @author wxz
+ * @date 2021.07.14 17:13:41
+*/
+@Component
+public class RocketMQConsumerRegister extends MQAbstractRegister {
+
+    @Override
+    public void registerAllListeners(String env, MQConsumerProperties consumerProperties) {
+        // 客户初始化监听器注册
+        register(consumerProperties,
+                ConsomerGroupConstants.CAL_PARTY_UNIT_SATISFACTION,
+                MessageModel.CLUSTERING,
+                TopicConstants.CAL_PARTY_UNIT_SATISFACTION,
+                "*",
+                new PartyUnitSatisfactionCalEventListener());
+
+        // ...其他监听器类似
+    }
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/mq/listener/PartyUnitSatisfactionCalEventListener.java

@@ -0,0 +1,104 @@
+package com.epmet.mq.listener;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.constants.MQUserPropertys;
+import com.epmet.commons.rocketmq.messages.CalPartyUnitSatisfactionFormDTO;
+import com.epmet.commons.tools.distributedlock.DistributedLock;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.service.IcPartyUnitService;
+import org.apache.commons.lang.StringUtils;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
+import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.redisson.api.RLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @Description 计算区域化党建单位，群众满意度=分数相加➗ 需求的总个数。
+ * @author wxz
+ * @date 2021.10.13 15:21:48
+*/
+public class PartyUnitSatisfactionCalEventListener implements MessageListenerConcurrently {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    private RedisUtils redisUtils;
+
+    @Override
+    public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) {
+
+        if (redisUtils == null) {
+            redisUtils = SpringContextUtils.getBean(RedisUtils.class);
+        }
+
+        try {
+            msgs.forEach(msg -> consumeMessage(msg));
+        } catch (Exception e) {
+            logger.error(ExceptionUtils.getErrorStackTrace(e));
+            return ConsumeConcurrentlyStatus.RECONSUME_LATER;
+        }
+        return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
+    }
+
+    private void consumeMessage(MessageExt messageExt) {
+        // msg即为消息体
+        // tags为SystemMessageType.java中的项，为具体的操作，此处拿到tags，判断是创建还是变更，来做响应的后续操作即可
+        String msg = new String(messageExt.getBody());
+        String topic = messageExt.getTopic();
+        String tags = messageExt.getTags();
+        String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.BLOCKED_MSG_LABEL);
+
+        logger.info("【计算区域化党建单位群众满意度事件监听器】-需求完成-收到消息内容:{},操作:{}", msg, tags);
+        CalPartyUnitSatisfactionFormDTO obj = JSON.parseObject(msg, CalPartyUnitSatisfactionFormDTO.class);
+
+        DistributedLock distributedLock = null;
+        RLock lock = null;
+        try {
+            distributedLock = SpringContextUtils.getBean(DistributedLock.class);
+            lock = distributedLock.getLock(String.format("lock:ic_warn_stats:%s", obj.getCustomerId()),
+                    30L, 30L, TimeUnit.SECONDS);
+            //待执行方法
+            SpringContextUtils.getBean(IcPartyUnitService.class).calPartyUnitSatisfation(obj);
+        } catch (RenException e) {
+            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
+            logger.error("【计算区域化党建单位群众满意度事件监听器】-MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+        } catch (Exception e) {
+            // 不是我们自己抛出的异常，可以让MQ重试
+            logger.error("【计算区域化党建单位群众满意度监听器】-MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+            throw e;
+        } finally {
+            distributedLock.unLock(lock);
+        }
+
+        if (StringUtils.isNotBlank(pendingMsgLabel)) {
+            try {
+                removePendingMqMsgCache(pendingMsgLabel);
+            } catch (Exception e) {
+                logger.error("【计算区域化党建单位群众满意度监听器】-删除mq阻塞消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e));
+            }
+        }
+    }
+
+    /**
+     * @description
+     *
+     * @param pendingMsgLabel
+     * @return
+     * @author wxz
+     * @date 2021.10.14 16:32:32
+     */
+    private void removePendingMqMsgCache(String pendingMsgLabel) {
+        String key = RedisKeys.blockedMqMsgKey(pendingMsgLabel);
+        redisUtils.delete(key);
+        //logger.info("【开放数据事件监听器】删除mq阻塞消息缓存成功,blockedMsgLabel:{}", pendingMsgLabel);
+    }
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java

@@ -19,6 +19,7 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
+import com.epmet.commons.rocketmq.messages.CalPartyUnitSatisfactionFormDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -141,4 +142,10 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
      * @Date 2021/12/9 10:10
      */
     List<PartyUnitDistributionResultDTO> distribution(PartyActivityFormDTO formDTO);
+
+    /**
+     * 计算区域化党建单位的群众满意度
+     * @param formDTO
+     */
+    void calPartyUnitSatisfation(CalPartyUnitSatisfactionFormDTO formDTO);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java

@@ -25,6 +25,7 @@ import com.epmet.dto.result.demand.CategoryAnalysisResDTO;
 import com.epmet.dto.result.demand.DemandRecResultDTO;
 import com.epmet.dto.result.demand.DemandResearchAnalysisResultDTO;
 import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
+import com.epmet.dto.result.demand.ServiceStatDTO;
 import com.epmet.entity.IcUserDemandRecEntity;
 
 import java.util.List;
@@ -169,4 +170,13 @@ public interface IcUserDemandRecService extends BaseService<IcUserDemandRecEntit
      * @return
      */
     CategoryAnalysisResDTO categoryAnalysis(CategoryAnalysisFormDTO formDTO);
+
+    /**
+     * 计算出服务方，评价总分，服务的需求个数
+     *
+     * @param customerId
+     * @param partyUnitId
+     * @return
+     */
+    List<ServiceStatDTO> groupByPartyUnit(String customerId, String partyUnitId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java

@@ -18,9 +18,11 @@
 package com.epmet.service.impl;
 
 import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.rocketmq.messages.CalPartyUnitSatisfactionFormDTO;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
@@ -46,6 +48,7 @@ import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.form.demand.SubCodeFormDTO;
 import com.epmet.dto.result.PartyUnitDistributionResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
+import com.epmet.dto.result.demand.ServiceStatDTO;
 import com.epmet.entity.IcPartyUnitEntity;
 import com.epmet.excel.IcPartyUnitImportExcel;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
@@ -64,6 +67,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -111,6 +115,9 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
             } else {
                 item.setServiceMatterList(new ArrayList<>());
             }
+            if(StringUtils.isBlank(item.getSatisfaction())){
+                item.setSatisfaction(StrConstant.HYPHEN);
+            }
         });
         PageInfo<IcPartyUnitDTO> pageInfo = new PageInfo<>(dtoList);
         return new PageData<>(dtoList, pageInfo.getTotal());
@@ -426,6 +433,23 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         return list;
     }
 
+    /**
+     * 计算区域化党建单位的群众满意度
+     * 总分➗需求个数
+     * @param formDTO
+     */
+    @Override
+    public void calPartyUnitSatisfation(CalPartyUnitSatisfactionFormDTO formDTO) {
+        log.info("收到消息内容啦...." + JSON.toJSONString(formDTO));
+        List<ServiceStatDTO> list = icUserDemandRecService.groupByPartyUnit(formDTO.getCustomerId(), formDTO.getPartyUnitId());
+        for (ServiceStatDTO serviceStatDTO : list) {
+            if (0 != serviceStatDTO.getDemandCount()) {
+                BigDecimal result = serviceStatDTO.getTotalScore().divide(new BigDecimal(serviceStatDTO.getDemandCount()), 4, BigDecimal.ROUND_HALF_UP);
+                baseDao.updateSatisfaction(serviceStatDTO.getServerId(),result);
+            }
+        }
+    }
+
     private String getServiceMatter(Map<String, String> map, String matter) {
         List<String> matters = Arrays.asList(matter.split(StrConstant.COLON));
         List<String> list = matters.stream().map(map::get).collect(Collectors.toList());

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -21,6 +21,7 @@ import com.alibaba.fastjson.JSON;
 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.rocketmq.messages.CalPartyUnitSatisfactionFormDTO;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
@@ -33,6 +34,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.SystemMessageType;
 import com.epmet.constant.UserDemandConstant;
 import com.epmet.dao.IcUserDemandOperateLogDao;
 import com.epmet.dao.IcUserDemandRecDao;
@@ -42,13 +44,18 @@ import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.IcUserDemandRecDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.dto.form.SystemMsgFormDTO;
 import com.epmet.dto.form.demand.*;
 import com.epmet.dto.result.AllGridsByUserIdResultDTO;
 import com.epmet.dto.result.IcResiUserBriefDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
+import com.epmet.dto.result.demand.DemandRecResultDTO;
+import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
+import com.epmet.dto.result.demand.ServiceStatDTO;
 import com.epmet.dto.result.demand.*;
 import com.epmet.entity.*;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.IcResiDemandDictService;
@@ -90,6 +97,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
     private EpmetAdminOpenFeignClient adminOpenFeignClient;
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
     @Override
     public PageData<IcUserDemandRecDTO> page(Map<String, Object> params) {
@@ -459,6 +468,18 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         satisfactionEntity.setEvaluateTime(logEntity.getOperateTime());
         satisfactionEntity.setScore(formDTO.getScore());
         demandSatisfactionDao.insert(satisfactionEntity);
+        //5、如果服务方区域化党建单位，需求重新计算当前这个单位的满意度。
+
+        //如果服务方是区域化党建单位，需要实时去计算他的群众满意度=服务过的需求的评价分数相加➗ 需求的总个数。
+        if(UserDemandConstant.PARTY_UNIT.equals(serviceEntity.getServiceType())){
+            CalPartyUnitSatisfactionFormDTO mqMsg = new CalPartyUnitSatisfactionFormDTO();
+            mqMsg.setCustomerId(formDTO.getCustomerId());
+            mqMsg.setPartyUnitId(serviceEntity.getServerId());
+            SystemMsgFormDTO form = new SystemMsgFormDTO();
+            form.setMessageType(SystemMessageType.CAL_PARTY_UNIT_SATISFACTION);
+            form.setContent(mqMsg);
+            epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
+        }
     }
 
     /**
@@ -615,6 +636,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             }
             demandData.get(NumConstant.ZERO).setDemandList(CollectionUtils.isNotEmpty(demandList) ? demandList : Collections.emptyList());
         }
+        resultDTO.setDemandData(demandData);
         return resultDTO;
     }
 
@@ -821,6 +843,20 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         });
         return l;
     }
+    /**
+     * 计算出服务方，评价总分，服务的需求个数
+     *
+     * @param customerId
+     * @param partyUnitId
+     * @return
+     */
+    @Override
+    public List<ServiceStatDTO> groupByPartyUnit(String customerId, String partyUnitId) {
+        if(StringUtils.isBlank(customerId)&&StringUtils.isBlank(partyUnitId)){
+            return new ArrayList<>();
+        }
+        return baseDao.selectGroupByPartyUnit(customerId,partyUnitId);
+    }
 
 
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml

@@ -141,7 +141,10 @@ dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
     secret: @dingTalk.robot.secret@
-
+rocketmq:
+  #  是否开启mq
+  enable: @rocketmq.enable@
+  name-server: @rocketmq.nameserver@
 # 停机选项
 shutdown:
   graceful:

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml

@@ -74,4 +74,10 @@
             ID
     </select>
 
+    <update id="updateSatisfaction" parameterType="map">
+        update ic_party_unit
+        set SATISFACTION=#{satisfaction},UPDATED_TIME=NOW()
+        where del_flag='0'
+        and id=#{partyUnitId}
+    </update>
 </mapper>

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml

@@ -356,4 +356,26 @@
         and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') <= #{endDateId}
         and m.CATEGORY_CODE like concat(#{categoryCode},'%')
     </select>
+
+
+    <select id="selectGroupByPartyUnit" parameterType="map" resultType="com.epmet.dto.result.demand.ServiceStatDTO">
+        SELECT
+            S.SERVER_ID AS serverId,
+            SUM( M.SCORE ) AS totalScore,
+            count( DISTINCT m.DEMAND_REC_ID ) AS demandCount
+        FROM
+            ic_user_demand_satisfaction m
+            INNER JOIN ic_user_demand_rec r ON ( m.DEMAND_REC_ID = r.id )
+            INNER JOIN ic_user_demand_service s ON ( R.ID = s.DEMAND_REC_ID )
+        WHERE
+            m.DEL_FLAG = '0'
+            AND r.DEL_FLAG = '0'
+            AND m.CUSTOMER_ID = #{customerId}
+            AND r.`STATUS` = 'finished'
+            and s.SERVICE_TYPE ='party_unit'
+            <if test="null !=partyUnitId and partyUnitId!='' ">
+                and s.server_id=#{partyUnitId}
+            </if>
+            group by s.SERVER_ID
+    </select>
 </mapper>

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsDemandTask.java

@@ -0,0 +1,23 @@
+package com.epmet.task;
+
+import com.epmet.feign.DataStatisticalOpenFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description
+ * @Author wangxianzhang
+ * @Date 2021/12/13 9:40 上午
+ * @Version 1.0
+ */
+@Component("statsDemandTask")
+public class StatsDemandTask implements ITask {
+
+    @Autowired
+    private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
+    
+    @Override
+    public void run(String params) {
+        dataStatisticalOpenFeignClient.statsVolunteerDemandServicesDaily(null);
+    }
+}

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java

@@ -100,4 +100,8 @@ public interface SystemMessageType {
      */
     String IC_RESI_USER_DEL = "ic_resi_user_del";
 
+    /**
+     *  需求完成，如果服务方是区域化党建单位，重新计算这个单位的满意度
+     */
+    String CAL_PARTY_UNIT_SATISFACTION = "cal_party_unit_satisfaction";
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java

@@ -192,6 +192,9 @@ public class SystemMessageServiceImpl implements SystemMessageService {
             case SystemMessageType.IC_RESI_USER_DEL:
                 topic = TopicConstants.IC_RESI_USER;
                 break;
+            case SystemMessageType.CAL_PARTY_UNIT_SATISFACTION:
+                topic=TopicConstants.CAL_PARTY_UNIT_SATISFACTION;
+                break;
         }
         return topic;
     }