Merge remote-tracking branch 'remotes/origin/dev'

epmet-commons/epmet-commons-rocketmq/pom.xml

@@ -16,6 +16,11 @@
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-spring-boot-starter</artifactId>
             <version>2.0.1</version>
+            <!--<version>2.2.0</version>-->
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

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

@@ -26,4 +26,9 @@ public interface ConsomerGroupConstants {
      */
     String PROJECT_CHANGED_COMPONENTS_GROUP = "project_changed_components_group";
 
+    /**
+     * 小组成就消费者组
+     */
+    String GROUP_ACHIEVEMENT_COMPONENTS_GROUP = "group_achievement_components_group";
+
 }

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

@@ -1,6 +1,16 @@
 package com.epmet.commons.rocketmq.constants;
 
 public interface TopicConstants {
+    /**
+     * 初始化客户
+     */
     String INIT_CUSTOMER = "init_customer";
+    /**
+     * 项目变动
+     */
     String PROJECT_CHANGED = "project_changed";
+    /**
+     * 小组成就
+     */
+    String GROUP_ACHIEVEMENT = "group_achievement";
 }

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

@@ -0,0 +1,27 @@
+package com.epmet.commons.rocketmq.messages;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * desc:小组成就mq消息类
+ *
+ * @author LiuJanJun
+ * @date 2021/4/22 8:35 下午
+ */
+@Data
+@AllArgsConstructor
+public class GroupAchievementMQMsg implements Serializable {
+
+    private String customerId;
+
+    private String groupId;
+
+    /**
+     * 成就类型
+     * @see com.epmet.modules.enums.AchievementTypeEnum
+     */
+    private String achievementType;
+}

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/register/ConsumerConfigProperties.java

@@ -0,0 +1,43 @@
+package com.epmet.commons.rocketmq.register;
+
+import lombok.Data;
+import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
+
+import java.io.Serializable;
+
+/**
+ * desc:mq 消费配置类
+ *
+ * @author: LiuJanJun
+ * @date: 2021/4/30 2:39 下午
+ * @version: 1.0
+ */
+@Data
+public class ConsumerConfigProperties implements Serializable {
+
+    private static final long serialVersionUID = 2069676324708473773L;
+    /**
+     * 消费者组
+     */
+    private String consumerGroup;
+    /**
+     * 主题
+     */
+    private String topic;
+    /**
+     * 标签
+     */
+    private String tag = "*";
+    /**
+     * 最小消费的线程数
+     */
+    private int consumeThreadMin = 2;
+    /**
+     * 最大消费的线程数
+     */
+    private int consumeThreadMax = 4;
+    /**
+     * 消费监听器
+     */
+    private MessageListenerConcurrently consumerListener;
+}

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/register/MQConsumerRegister.java

@@ -0,0 +1,79 @@
+package com.epmet.commons.rocketmq.register;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
+import org.apache.rocketmq.client.exception.MQClientException;
+import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
+import org.springframework.beans.factory.annotation.Value;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * desc：注册mq监听器
+ *
+ * @author liujianjun
+ */
+@Slf4j
+public abstract class MQConsumerRegister {
+    @Value("${spring.profiles.active}")
+    private String env;
+    @Value("${rocketmq.name-server}")
+    private String namesrvAddr;
+
+    public abstract ConsumerConfigProperties getConsumerProperty();
+
+
+    /**
+     * @return
+     * @Description 注册监听器
+     * @author wxz
+     * @date 2021.03.03 16:09
+     */
+    @PostConstruct
+    public void registerMQListener() {
+        ConsumerConfigProperties consumerProperty = getConsumerProperty();
+        log.info("registerAllListeners consumers:{} success", consumerProperty);
+        //本地环境不注册
+        //if (!"local".equals(env)) {
+            try {
+                // 实例化消费者
+                DefaultMQPushConsumer consumer = new DefaultMQPushConsumer(consumerProperty.getConsumerGroup());
+
+                // 设置NameServer的地址
+                consumer.setNamesrvAddr(namesrvAddr);
+                consumer.setMessageModel(MessageModel.CLUSTERING);
+                consumer.setInstanceName(buildInstanceName());
+                // 订阅一个或者多个Topic，以及Tag来过滤需要消费的消息
+                consumer.subscribe(consumer.getConsumerGroup(), consumerProperty.getTag());
+                // 注册回调实现类来处理从broker拉取回来的消息
+                consumer.registerMessageListener(consumerProperty.getConsumerListener());
+                consumer.setConsumeThreadMin(consumerProperty.getConsumeThreadMin());
+                consumer.setConsumeThreadMax(consumerProperty.getConsumeThreadMax());
+                // 启动消费者实例
+                consumer.start();
+            } catch (MQClientException e) {
+                log.info("registerMQListener exception", e);
+            }
+
+        //}
+
+    }
+
+    /**
+     * desc: 因为docker-compose部署有问题 所有自己命名
+     *
+     * @param
+     * @return java.lang.String
+     * @author LiuJanJun
+     * @date 2021/4/30 5:00 下午
+     */
+    private String buildInstanceName() {
+        String instanceName = "";
+        for (int i = 0; i < 4; i++) {
+            int t = (int) (Math.random() * 10);
+            instanceName = instanceName.concat(t + "");
+        }
+
+        return instanceName;
+    }
+}

epmet-commons/epmet-commons-tools/pom.xml

@@ -134,7 +134,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.2</version>
+            <version>4.5.13</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java

@@ -41,6 +41,7 @@ public interface NumConstant {
     int SIXTY = 60;
     int ONE_HUNDRED = 100;
     int TWO_HUNDRED = 200;
+    int FIVE_HUNDRED = 500;
     BigDecimal ONE_HUNDRED_DECIMAL = new BigDecimal(100);
     BigDecimal ZERO_DECIMAL = new BigDecimal(0);
     int ONE_THOUSAND = 1000;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/FileCommonDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.commons.tools.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/12/21 15:37
+ */
+@NoArgsConstructor
+@Data
+public class FileCommonDTO implements Serializable {
+
+	private static final long serialVersionUID = -5307959406648243353L;
+	/**
+	 * 文件名
+	 */
+	private String name;
+	/**
+	 * url地址
+	 */
+	private String url;
+	/**
+	 * 文件类型(图片 - image、 视频 - video、 语音 - voice、 文档 - doc)
+	 */
+	private String type;
+	/**
+	 * 后缀名
+	 */
+	private String format;
+	/**
+	 * 文件大小  kb
+	 */
+	private Integer size;
+	/**
+	 * 语音或视频文件时长，单位秒
+	 */
+	private Integer duration;
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/mq/MqBaseParamDTO.java

@@ -14,5 +14,4 @@ import java.io.Serializable;
 public class MqBaseParamDTO implements Serializable {
 	private String appId;
 	private String token;
-	private String requestUrl;
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/mq/eventmsg/BasePointEventMsg.java

@@ -29,6 +29,22 @@ public class BasePointEventMsg implements Serializable {
 	 * 客户Id
 	 */
 	private String customerId;
+
+	/**
+	 * 机关Id
+	 */
+	private String agencyId;
+
+	/**
+	 * 网格Id
+	 */
+	private String gridId;
+
+	/**
+	 * 小组ID
+	 */
+	private String groupId;
+
 	/**
 	 * 被操作用户id
 	 */
@@ -54,6 +70,11 @@ public class BasePointEventMsg implements Serializable {
 	 */
 	private String remark;
 
+	/**
+	 * 业务类型 eg：活动id
+	 */
+	private String sourceType;
+
 	/**
 	 * 业务id eg：活动id
 	 */
@@ -69,4 +90,6 @@ public class BasePointEventMsg implements Serializable {
 	private Date targetDate;
 
 	private String eventTag;
+
+	private String eventClass;
 	}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/AchievementTypeEnum.java

@@ -0,0 +1,49 @@
+package com.epmet.commons.tools.enums;
+
+/**
+ * 小组成就类型枚举类
+ * dev|test|prod
+ *
+ * @author jianjun liu
+ * @date 2020-07-03 11:14
+ **/
+public enum AchievementTypeEnum {
+	/**
+	 * 环境变量枚举
+	 */
+	MEMBER("member", "小组成员数"),
+	TOPIC("topic", "话题数"),
+	TOISSUE("toissue", "转议题数"),
+	RESOVLE_TOPIC("resovletopic", "解决话题数"),
+	;
+
+	private String code;
+	private String name;
+
+
+
+	AchievementTypeEnum(String code, String name) {
+		this.code = code;
+		this.name = name;
+	}
+
+	public static AchievementTypeEnum getEnum(String code) {
+		AchievementTypeEnum[] values = AchievementTypeEnum.values();
+		for (AchievementTypeEnum value : values) {
+			if (value.getCode().equals(code)) {
+				return value;
+			}
+		}
+		return null;
+	}
+
+
+	public String getCode() {
+		return code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java

@@ -0,0 +1,28 @@
+package com.epmet.commons.tools.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/4/25 15:49
+ */
+@Getter
+@AllArgsConstructor
+public enum BizTypeEnum {
+	//枚举类型
+	GROUP("group", "小组"),
+	ACTIVITY("activity", "活动"),
+	AGENCY("agency", "组织");
+
+	/**
+	 * 类型
+	 */
+	private String type;
+	/**
+	 * 描述
+	 */
+	private String typeDesc;
+
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EventEnum.java

@@ -17,6 +17,7 @@ public enum EventEnum {
 	TOPIC_SHIFTED_TO_ISSUE("topic_to_issue","resi_group","话题被转为议题(小组中发布的话题被组长转为议题)"),
 	SHIFT_TOPIC_TO_ISSUE("shift_topic_to_issue","resi_group","转话题为议题(将自建小组中话题转为议题)"),
 	TOPIC_SHIFTED_TO_PROJECT("topic_to_project","resi_group","话题被转为项目"),
+	LEADER_RESOLVE_TOPIC("leader_resolve_topic","resi_group","组长解决组内话题"),
 	;
 
 	private String eventClass;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/SourceTypeEnum.java

@@ -0,0 +1,31 @@
+package com.epmet.commons.tools.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/4/25 16:23
+ */
+@Getter
+@AllArgsConstructor
+public enum SourceTypeEnum {
+	//枚举类型
+	ACTIVITY("activity", "活动"),
+	TOPIC("topic", "话题"),
+	ISSUE("issue", "议题"),
+	PROJECT("project", "项目"),
+	INVITE("invite", "邀请进组"),
+	MANUAL("manual", "人工调整"),
+	VOLUNTEER("volunteer", "志愿者");
+
+	/**
+	 * 类型
+	 */
+	private String type;
+	/**
+	 * 描述
+	 */
+	private String typeDesc;
+}

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

@@ -161,7 +161,28 @@ public enum EpmetErrorCode {
 	OPEN_API_SIGN_ERROR(10104, "签名错误"),
 	OPEN_API_PARAMS_APPID_DIFF(10105, "app_id不一致"), // app_id在请求参数中和在token中不一致
 	OPEN_API_REQUEST_EXPIRED(10106, "请求过期"),
-	OPEN_API_REQUEST_REPEAT(10107, "请求重复");
+	OPEN_API_REQUEST_REPEAT(10107, "请求重复"),
+
+	//楼院小组89
+	GROUP_ACT_CANCELED_CAN_NOT_EDIT(8901,"活动已取消，不能编辑"),
+	GROUP_ACT_CLOSED_CAN_NOT_EDIT(8902,"活动已关闭，不能编辑"),
+	PLEASE_INPUT_ACT_CONTENT(8903,"请输入活动内容,或添加图片"),
+	GROUP_ACT_CONTENT_MAX(8904,"活动内容至多输入1000字"),
+	GROUP_ACT_IMG_MAX(8905,"最多可添加3张图片"),
+	PARTY_MEMBER_CREATE_BRANCH_GROUP(8906,"您不是党员，不能创建支部小组"),
+	NOT_IN_GROUP_CAN_NOT_VIEW(8907,"当前内容仅允许组内成员查看"),
+	PARTY_MEMBER_JOIN_BRANCH_GROUP(8908,"您不是党员，不能加入支部小组"),
+	GROUP_ACT_CAN_NOT_CANCEL(8909,"当前活动已关闭或已取消"),
+	CHANGE_LEADER(8910,"请先转移组长身份在退组"),
+
+	//8910的msg动态赋值
+	GROUP_ACT_CAN_NOT_COMMENT(8910,"当前活动,不能评论"),
+	SIGN_IN_TIME_NOT_START(8911,"未到签到时间,不允许签到"),
+	SIGN_IN_TIME_PASSED(8912,"当前时间已超过签到时间"),
+	INVITATION_NOT_EXIST(8913,"链接不存在"),
+	NOTICE_EXPIRATION_TIME(8914,"通知过期时间不能早于当前时间"),
+	NOTICE_BE_OVERDUE(8915,"通知已过期不允许再次变更");
+
 
 	private int code;
 	private String msg;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -8,7 +8,9 @@
 
 package com.epmet.commons.tools.redis;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -429,4 +431,32 @@ public class RedisKeys {
 	public static String getThirdPlatformAccessTokenKey(String platformId) {
 		return rootPrefix.concat("thirdplatform:accesstoken:").concat(platformId);
 	}
+
+	/**
+	 * @return 设置组员已读、未读标识
+	 * @param source :act  notice
+	 * @param groupId 小组id
+	 * @param sourceId 活动id，或者通知id
+	 * @author yinzuomei
+	 * @description  groupread:202104:act:groupId:actId
+	 * @Date 2021/4/22 16:38
+	 **/
+	public static String getGroupMsgReadKey(String source, String groupId, String sourceId) {
+		String currentMonth= DateUtils.getBeforeNMonth(NumConstant.ZERO);
+		return "groupread:".concat(currentMonth).concat(":").concat(source).concat(":").concat(groupId).concat(":").concat(sourceId);
+	}
+
+	/**
+	 * @return 设置应读人员标识 ，默认全部赋值1
+	 * @param source :act  notice
+	 * @param groupId 小组id
+	 * @param sourceId 活动id，或者通知id
+	 * @author yinzuomei
+	 * @description  groupread:user:202104:act:groupId:actId
+	 * @Date 2021/4/22 16:38
+	 **/
+	public static String getGroupMsgShouldReadUser(String source, String groupId, String sourceId) {
+		String currentMonth= DateUtils.getBeforeNMonth(NumConstant.ZERO);
+		return "groupread:user:".concat(currentMonth).concat(":").concat(source).concat(":").concat(groupId).concat(":").concat(sourceId);
+	}
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java

@@ -13,10 +13,7 @@ import com.epmet.commons.tools.exception.RenException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
-import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.*;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.core.ZSetOperations;
 import org.springframework.data.redis.support.atomic.RedisAtomicLong;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -422,4 +419,19 @@ public class RedisUtils {
         return redisTemplate.hasKey(key);
     }
 
+    public Boolean setBit(String key, long offset, boolean value) {
+        return redisTemplate.opsForValue().setBit(key, offset, value);
+    }
+
+    public Boolean getBit(String key, long offset) {
+        return redisTemplate.opsForValue().getBit(key, offset);
+    }
+
+    public Long bitCount(String key) {
+        return redisTemplate.execute((RedisCallback<Long>) con -> con.bitCount(key.getBytes()));
+    }
+
+    public Long bitCount(String key, int start, int end) {
+        return redisTemplate.execute((RedisCallback<Long>) con -> con.bitCount(key.getBytes(), start, end));
+    }
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java

@@ -558,6 +558,17 @@ public class DateUtils {
         return format.format(timestamp * 1000);
     }
 
+    /**
+     * 日期格式转时间戳
+     * @author zhaoqifeng
+     * @date 2021/4/19 14:52
+     * @param date
+     * @return java.lang.Long
+     */
+    public static Long dateToTimestamp(Date date) {
+        return date.getTime()/NumConstant.ONE_THOUSAND;
+    }
+
     /**
      * @return java.util.Date
      * @param minStr yyyy-MM-dd HH:mm字符串

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java

@@ -101,6 +101,7 @@ public class HttpClientManager {
 	private static RequestConfig requestConfig = RequestConfig.custom()
 			.setSocketTimeout(soTimeout)
 			.setConnectTimeout(connectionTimeout)
+			.setConnectionRequestTimeout(soTimeout)
 			.build();//设置请求和传输超时时间
 
 	public static HttpClientManager getInstance() {

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SendMqMsgUtils.java

@@ -29,6 +29,8 @@ import java.util.Map;
 @Component
 public class SendMqMsgUtils {
     private static MqConfig mqConfig;
+    private static String requestUrl;
+
 
     /**
      * desc:发送mq消息(如果失败重试1次)
@@ -39,22 +41,23 @@ public class SendMqMsgUtils {
         if (mqConfig == null) {
             mqConfig = SpringContextUtils.getBean(MqConfig.class);
         }
-        log.info("sendMsg param:{}", JSON.toJSONString(msg));
+        if (requestUrl == null){
+            requestUrl = mqConfig.getHost().concat(MqMethodPathEnum.SEND_MSG.getCode());
+        }
         try {
-            //  TODO
             ValidatorUtils.validateEntity(msg, DefaultGroup.class);
         } catch (ValidateException e) {
             return new Result<String>().error(e.getMsg());
         }
         msg.setAppId(mqConfig.getAppId());
-        msg.setRequestUrl(mqConfig.getHost().concat(MqMethodPathEnum.SEND_MSG.getCode()));
         msg.setToken(mqConfig.getToken());
         try {
             int retryTime = 0;
             Result<String> result = null;
+            log.info("sendMsg url:{},param:{}", requestUrl, JSON.toJSONString(msg));
             do {
+                result = HttpClientManager.getInstance().sendPostByHttps(requestUrl, JSON.toJSONString(msg));
                 retryTime++;
-                result = HttpClientManager.getInstance().sendPostByHttps(msg.getRequestUrl(), JSON.toJSONString(msg));
                 log.info("sendMsg retryTime:{},result:{}", retryTime, JSON.toJSONString(result));
             } while ((!result.success()) && retryTime < 2);
 
@@ -78,6 +81,16 @@ public class SendMqMsgUtils {
         }
     }
 
+    public static void main(String[] args) {
+        mqConfig = new MqConfig();
+        mqConfig.setAppId("202007161443499985fa2d397436d10356542134c8f008c48");
+        mqConfig.setToken("52d9d9b0e7d0eb5b8b81c205b579e07c");
+        mqConfig.setHost("https://epmet-dev.elinkservice.cn/estos/");
+        String msg = "{\"eventClass\":\"resi_group\",\"eventTag\":\"shift_topic_to_issue\",\"msg\":\"[{\\\"actionFlag\\\":\\\"plus\\\",\\\"agencyId\\\":\\\"e9b55911549fe7b0d0427b557f7c5efc\\\",\\\"customerId\\\":\\\"45687aa479955f9d06204d415238f7cc\\\",\\\"eventClass\\\":\\\"resi_group\\\",\\\"eventTag\\\":\\\"topic_to_issue\\\",\\\"gridId\\\":\\\"708a3567b54ced7219666489f9d838ab\\\",\\\"groupId\\\":\\\"5b0bc6c3c409de4b7e2fdc5c13c43b1e\\\",\\\"isCommon\\\":false,\\\"remark\\\":\\\"支部测试1小组中发布的话题\\\\\\\"33\\\\\\\"被转为议题\\\",\\\"sourceId\\\":\\\"798f4081dbe94435a55c5004c7d01458\\\",\\\"sourceType\\\":\\\"issue\\\",\\\"userId\\\":\\\"3e12b2264da616f85def807e89dd7150\\\"},{\\\"actionFlag\\\":\\\"plus\\\",\\\"agencyId\\\":\\\"e9b55911549fe7b0d0427b557f7c5efc\\\",\\\"customerId\\\":\\\"45687aa479955f9d06204d415238f7cc\\\",\\\"eventTag\\\":\\\"shift_topic_to_issue\\\",\\\"gridId\\\":\\\"708a3567b54ced7219666489f9d838ab\\\",\\\"groupId\\\":\\\"5b0bc6c3c409de4b7e2fdc5c13c43b1e\\\",\\\"isCommon\\\":false,\\\"remark\\\":\\\"将话题\\\\\\\"33\\\\\\\"转为议题\\\",\\\"sourceId\\\":\\\"798f4081dbe94435a55c5004c7d01458\\\",\\\"sourceType\\\":\\\"issue\\\",\\\"userId\\\":\\\"3e12b2264da616f85def807e89dd7150\\\"}]\"}";
+        MqBaseMsgDTO mqBaseMsgDTO = JSON.parseObject(msg, MqBaseMsgDTO.class);
+        Result<String> stringResult = sendMsg(mqBaseMsgDTO);
+    }
+
 
     /**
      * desc:发送mq消息

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/UniqueIdGenerator.java

@@ -11,6 +11,8 @@ import java.util.concurrent.atomic.AtomicLong;
  * 唯一ID生成器
  */
 public class UniqueIdGenerator {
+    public final static String FORMAT_DMDHS = "yyyyMMddHHmmss";
+
 
     private static UniqueValue uniqueValue = new UniqueValue();
     private static String middle;
@@ -25,7 +27,7 @@ public class UniqueIdGenerator {
     private static class UniqueValue {
 
         private AtomicLong uniqueValue = new AtomicLong(0L);
-        private volatile String currentTime = DateUtils.format(new Date(), DateUtils.DATE_TIME_NO_SPLIT);
+        private volatile String currentTime = DateUtils.format(new Date(), FORMAT_DMDHS);
         private volatile String lastTime = currentTime;
 
         /**
@@ -35,7 +37,7 @@ public class UniqueIdGenerator {
          * @return
          */
         public String getCurrentTime() {
-            currentTime = DateUtils.format(new Date(), DateUtils.DATE_TIME_NO_SPLIT);
+            currentTime = DateUtils.format(new Date(), FORMAT_DMDHS);
             if (!currentTime.equals(lastTime)) {
                 lastTime = currentTime;
                 Random random = new Random();
@@ -51,31 +53,32 @@ public class UniqueIdGenerator {
 
     /**
      * 生成一个24位唯一ID
-     * 15位时间+2位中间值（防止多服务冲突）+2个线程code+5位秒级递增值
+     * 14位时间+2位中间值（防止多服务冲突）+3个线程code+5位秒级递增值
      *
      * @return
      */
-    public static String generate() {
+    public static String generate24() {
         StringBuilder builder = new StringBuilder(32);
         builder.append(uniqueValue.getCurrentTime())
                 .append(middle)
-                .append(getUniqueThreadCode())
+                .append(getUniqueThreadCode(3))
                 .append(uniqueValue.getCurrentValue());
 
         return builder.toString();
     }
 
-    public static String getUniqueThreadCode() {
+    public static String getUniqueThreadCode(Integer length) {
-        String threadCode = StringUtils.left(String.valueOf(Thread.currentThread().hashCode()), 2);
+        String threadCode = StringUtils.left(String.valueOf(Thread.currentThread().hashCode()), length);
-        return StringUtils.leftPad(threadCode, 2, "0");
+        return StringUtils.leftPad(threadCode, length, "0");
     }
 
     public static void main(String[] args) throws InterruptedException {
 
         System.out.println(UniqueIdGenerator.uniqueValue.currentTime);
         System.out.println(UniqueIdGenerator.middle);
-        System.out.println(UniqueIdGenerator.getUniqueThreadCode());
+        System.out.println(UniqueIdGenerator.getUniqueThreadCode(2));
         System.out.println(uniqueValue.getCurrentValue());
+        System.out.println(UniqueIdGenerator.generate24());
 
     }
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/net/OkHttpUtil.java

@@ -48,6 +48,7 @@ public class OkHttpUtil {
         //支持HTTPS请求，跳过证书验证
         clientBuilder.sslSocketFactory(SSLSocketClient.getSSLSocketFactory(), SSLSocketClient.getX509TrustManager())
                 .hostnameVerifier(SSLSocketClient.getHostnameVerifier());
+        //clientBuilder.followRedirects(false).followSslRedirects(false);
         //clientBuilder.sslSocketFactory(createSSLSocketFactory());
         /*clientBuilder.hostnameVerifier(new HostnameVerifier() {
             @Override

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserInfosResultDTO.java

@@ -17,5 +17,6 @@ public class UserInfosResultDTO implements Serializable {
     private String userId;
     private String userShowName;
     private String headPhoto;
+    private String realName;
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java

@@ -83,4 +83,9 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
 	 * VISIT_SWITCH 小组是否允许参观:允许：open;不允许：closed
 	 */
 	private String visitSwitch;
+
+	/**
+	 * 小组类型(ordinary:楼院小组  branch:支部小组)
+	 */
+	private String groupType;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java

@@ -5,9 +5,11 @@ import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.resigroup.ResiGroupDao;
 import com.epmet.dataaggre.dao.resigroup.ResiTopicDao;
 import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO;
+import com.epmet.dataaggre.dto.resigroup.ResiGroupDTO;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
 import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO;
 import com.epmet.dataaggre.dto.resigroup.result.CandidateListResultDTO;
+import com.epmet.dataaggre.entity.resigroup.ResiGroupEntity;
 import com.epmet.dataaggre.redis.ResiGroupRedis;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.resigroup.ResiGroupService;
@@ -63,13 +65,19 @@ public class ResiGroupServiceImpl implements ResiGroupService {
         List<String> userIds = result.stream().map(m -> m.getUserId()).collect(Collectors.toList());
         // 查询用户信息【名字 头像】
         List<UserInfosResultDTO> userInfos = epmetUserService.selectUserInfosByUserIds(userIds);
+        //查询小组信息
+        ResiGroupEntity group = resiGroupDao.selectById(formDTO.getGroupId());
         result.forEach(r -> {
             if (!CollectionUtils.isEmpty(userInfos)){
                 userInfos.forEach(u -> {
                     if (r.getUserId().equals(u.getUserId())){
                         r.setHeadPhoto(u.getHeadPhoto());
+                        if("branch".equals(group.getGroupType())){
+                            r.setUserShowName(u.getRealName());
+                        }else {
                             r.setUserShowName(u.getUserShowName());
                         }
+                    }
                 });
             }
             // 徽章赋值

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml

@@ -12,7 +12,8 @@
                        WHEN GENDER = '2' THEN '女士'
                        ELSE '先生/女士' END
                 ) AS userShowName,
-            HEAD_IMG_URL AS headPhoto
+            HEAD_IMG_URL AS headPhoto,
+            CONCAT(STREET,'-',REAL_NAME) AS realName
         FROM user_base_info
         WHERE DEL_FLAG = 0
           AND

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java

@@ -157,7 +157,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
                     group1 = new IndexGroupTemplateEntity();
                     group1.setIndexId(indexDictEntity.getId());
                     group1.setParentIndexGroupId("0");
-                    group1.setId(UniqueIdGenerator.generate());
+                    group1.setId(UniqueIdGenerator.generate24());
                     group1.setIndexCode(Pinyin4jUtil.getSpellPinYin(indexDictEntity.getIndexName(), true, 4));
                     group1.setAllIndexCodePath(index.getAllIndexCodePath(0));
                     indexGroupMap.put(index.getLevel1Index(), group1);
@@ -173,7 +173,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
                     group2 = new IndexGroupTemplateEntity();
                     group2.setIndexId(indexDictEntity.getId());
                     group2.setParentIndexGroupId(group1.getId());
-                    group2.setId(UniqueIdGenerator.generate());
+                    group2.setId(UniqueIdGenerator.generate24());
                     group2.setIndexCode(Pinyin4jUtil.getSpellPinYin(indexDictEntity.getIndexName(), false, 4));
                     group2.setAllIndexCodePath(index.getAllIndexCodePath(3));
                     indexGroupMap.put(level4IndexDetailKey, group2);
@@ -184,7 +184,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
                         templateEntity.setIndexGroupId(group1.getId());
                         templateEntity.setIndexId(indexDictEntity.getId());
                         templateEntity.setAllParentIndexCode(allIndexCodeSb.toString());
-                        templateEntity.setId(UniqueIdGenerator.generate());
+                        templateEntity.setId(UniqueIdGenerator.generate24());
                         templateEntity.setCorrelation(index.getCorrelation());
                         templateEntity.setAllIndexCodePath(index.getAllIndexCodePath(3));
                         buildIndexGroupDetail(templateEntity, indexDictEntity, index, 2);
@@ -202,7 +202,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
                     templateEntity.setIndexGroupId(group2.getId());
                     templateEntity.setIndexId(indexDictEntity.getId());
                     templateEntity.setAllParentIndexCode(allIndexCodeSb.toString());
-                    templateEntity.setId(UniqueIdGenerator.generate());
+                    templateEntity.setId(UniqueIdGenerator.generate24());
                     templateEntity.setCorrelation(index.getCorrelation());
                     templateEntity.setAllIndexCodePath(index.getAllIndexCodePath(4));
                     buildIndexGroupDetail(templateEntity, indexDictEntity, index, 5);
@@ -217,7 +217,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
                     group1 = new IndexGroupTemplateEntity();
                     group1.setIndexId(indexDictEntity.getId());
                     group1.setParentIndexGroupId("0");
-                    group1.setId(UniqueIdGenerator.generate());
+                    group1.setId(UniqueIdGenerator.generate24());
                     group1.setIndexCode(Pinyin4jUtil.getSpellPinYin(indexDictEntity.getIndexName(), false, 4));
                     group1.setAllIndexCodePath(index.getAllIndexCodePath(0));
                     indexGroupMap.put(index.getLevel1Index(), group1);
@@ -232,7 +232,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
                     group2 = new IndexGroupTemplateEntity();
                     group2.setIndexId(indexDictEntity.getId());
                     group2.setParentIndexGroupId(group1.getId());
-                    group2.setId(UniqueIdGenerator.generate());
+                    group2.setId(UniqueIdGenerator.generate24());
                     group2.setIndexCode(Pinyin4jUtil.getSpellPinYin(indexDictEntity.getIndexName(), false, 4));
                     group2.setAllIndexCodePath(index.getAllIndexCodePath(1));
                     indexGroupMap.put(level2IndexGroupKey, group2);
@@ -243,7 +243,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
                         templateEntity.setIndexGroupId(group2.getId());
                         templateEntity.setIndexId(indexDictEntity.getId());
                         templateEntity.setAllParentIndexCode(allIndexCodeSb.toString());
-                        templateEntity.setId(UniqueIdGenerator.generate());
+                        templateEntity.setId(UniqueIdGenerator.generate24());
                         templateEntity.setCorrelation(index.getCorrelation());
                         templateEntity.setAllIndexCodePath(index.getAllIndexCodePath(1));
                         buildIndexGroupDetail(templateEntity, indexDictEntity, index, 2);
@@ -260,7 +260,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
                     templateEntity.setIndexGroupId(group2.getId());
                     templateEntity.setIndexId(indexDictEntity.getId());
                     templateEntity.setAllParentIndexCode(allIndexCodeSb.toString());
-                    templateEntity.setId(UniqueIdGenerator.generate());
+                    templateEntity.setId(UniqueIdGenerator.generate24());
                     templateEntity.setCorrelation(index.getCorrelation());
                     templateEntity.setAllIndexCodePath(index.getAllIndexCodePath(4));
                     buildIndexGroupDetail(templateEntity, indexDictEntity, index, 5);
@@ -289,7 +289,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
     private void buildIndexDicEntity(IndexModel data, IndexDictEntity entity, IndexDictEntity entity2, IndexDictEntity entity3, IndexDictEntity entity4, IndexDictEntity entity5) {
 
         if (!indexDicMap.containsKey(data.getLevel1Index())) {
-            entity.setId(UniqueIdGenerator.generate());
+            entity.setId(UniqueIdGenerator.generate24());
             entity.setIndexName(data.getLevel1Index());
             entity.setCorrelation(data.getCorrelation());
             entity.setLevel("1");
@@ -297,7 +297,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
             indexDicMap.put(data.getLevel1Index(), entity);
         }
         if (!indexDicMap.containsKey(data.getLevel2Index())) {
-            entity2.setId(UniqueIdGenerator.generate());
+            entity2.setId(UniqueIdGenerator.generate24());
             entity2.setIndexName(data.getLevel2Index());
             entity2.setCorrelation(data.getCorrelation());
             entity2.setLevel("2");
@@ -305,7 +305,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
             indexDicMap.put(data.getLevel2Index(), entity2);
         }
         if (!indexDicMap.containsKey(data.getLevel3Index())) {
-            entity3.setId(UniqueIdGenerator.generate());
+            entity3.setId(UniqueIdGenerator.generate24());
             entity3.setIndexName(data.getLevel3Index());
             entity3.setCorrelation(data.getCorrelation());
             entity3.setLevel("3");
@@ -313,7 +313,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
             indexDicMap.put(data.getLevel3Index(), entity3);
         }
         if (!indexDicMap.containsKey(data.getLevel4Index())) {
-            entity4.setId(UniqueIdGenerator.generate());
+            entity4.setId(UniqueIdGenerator.generate24());
             entity4.setIndexName(data.getLevel4Index());
             entity4.setCorrelation(data.getCorrelation());
             entity4.setLevel("4");
@@ -321,7 +321,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
             indexDicMap.put(data.getLevel4Index(), entity4);
         }
         if (!indexDicMap.containsKey(data.getLevel5Index())) {
-            entity5.setId(UniqueIdGenerator.generate());
+            entity5.setId(UniqueIdGenerator.generate24());
             entity5.setIndexName(data.getLevel5Index());
             entity5.setCorrelation(data.getCorrelation());
             entity5.setLevel("5");

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java

@@ -34,6 +34,7 @@ import java.util.stream.Collectors;
  * @date 2021.03.03 16:10
 */
 @Slf4j
+//@Component
 public class ProjectChangedCustomListener implements MessageListenerConcurrently {
 
     private Logger logger = LoggerFactory.getLogger(getClass());
@@ -56,7 +57,10 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
     private void consumeMessage(String  msg) {
         logger.info("receive customerId:{}", JSON.toJSONString(msg));
         ProjectChangedMQMsg msgObj = JSON.parseObject(msg, ProjectChangedMQMsg.class);
-
+        if (msgObj == null){
+            log.warn("consumeMessage msg body is blank");
+            return;
+        }
         DistributedLock distributedLock = null;
         RLock lock = null;
         try {
@@ -115,4 +119,14 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
         log.info("data-statical-server服务被关闭，执行未执行完的动作");
 
     }
+
+    /*@Override
+    public ConsumerConfigProperties getConsumerProperty() {
+        ConsumerConfigProperties configProperties = new ConsumerConfigProperties();
+        configProperties.setConsumerGroup(ConsomerGroupConstants.PROJECT_CHANGED_COMPONENTS_GROUP);
+        configProperties.setTopic(TopicConstants.PROJECT_CHANGED);
+        configProperties.setTag("*");
+        configProperties.setConsumerListener(this);
+        return configProperties;
+    }*/
 }

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

@@ -3,22 +3,22 @@ package com.epmet.mq;
 import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
 import com.epmet.commons.rocketmq.constants.TopicConstants;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.enums.EnvEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 
 @Slf4j
 @Component
-@Order(value = 111)
 public class RocketMQConsumerRegister {
-
+    @Value("${spring.profiles.active}")
+    private String env;
     @Value("${rocketmq.name-server}")
     private String nameServer;
 
@@ -31,7 +31,9 @@ public class RocketMQConsumerRegister {
     @PostConstruct
     public void registerAllListeners() {
         try {
+            if (!EnvEnum.LOCAL.getCode().equals(env)) {
                 register(ConsomerGroupConstants.PROJECT_CHANGED_COMPONENTS_GROUP, MessageModel.CLUSTERING, TopicConstants.PROJECT_CHANGED, "*", new ProjectChangedCustomListener());
+            }
         } catch (MQClientException e) {
             log.error("registerAllListeners exception", e);
         }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/IndexGroupServiceImpl.java

@@ -80,7 +80,7 @@ private IndexGroupTemplateDao indexGroupTemplateDao;
         List<IndexGroupEntity> insertGroupList = new ArrayList<>();
         groupMap.forEach((oldGroupTempId, o) -> {
             IndexGroupEntity newGroupEntity = ConvertUtils.sourceToTarget(o, IndexGroupEntity.class);
-            String newGroupId = UniqueIdGenerator.generate();
+            String newGroupId = UniqueIdGenerator.generate24();
             newGroupEntity.setId(newGroupId);
             newGroupEntity.setCustomerId(customerId);
             groupNewIdMap.put(oldGroupTempId, newGroupId);
@@ -99,7 +99,7 @@ private IndexGroupTemplateDao indexGroupTemplateDao;
 
 
             IndexGroupDetailEntity entity = ConvertUtils.sourceToTarget(groupDetailTemp, IndexGroupDetailEntity.class);
-            entity.setId(UniqueIdGenerator.generate());
+            entity.setId(UniqueIdGenerator.generate24());
             String newGroupId = groupNewIdMap.get(oldIndexGroupId);
             if (StringUtils.isBlank(newGroupId)){
                 log.error("新旧id映射关系有误");

epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.11__groupAchievementRule.sql

@@ -0,0 +1 @@
+INSERT INTO `epmet_point`.`point_rule_default`(`ID`, `RULE_NAME`, `RULE_DESC`, `EVENT_CODE`, `FUNCTION_ID`, `OPERATE_TYPE`, `UP_LIMIT`, `UP_LIMIT_DESC`, `UP_LIMIT_PREFIX`, `RULE_PERIOD`, `POINT`, `POINT_UNIT`, `ENABLED_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10', '组长解决话题', '组长解决组内话题', 'leader_resolve_topic', '1', 'plus', 0, '无上限', NULL, 'day', 2, 'time', '0', '0', 0, 'APP_USER', '2021-04-19 15:55:18', 'APP_USER', '2021-04-19 15:55:18');

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

@@ -239,6 +239,7 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
         actPointEventMsg.setActionFlag(MqConstant.PLUS);
         actPointEventMsg.setIsCommon(false);
         actPointEventMsg.setRemark(actInfoDTO.getTitle());
+        actPointEventMsg.setSourceType("activity");
         actPointEventMsg.setSourceId(formDTO.getActId());
         actPointEventMsgList.add(actPointEventMsg);
 

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

@@ -127,6 +127,8 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         BasePointEventMsg actPointEventMsg=new BasePointEventMsg();
         actPointEventMsg.setCustomerId(formDTO.getCustomerId());
         actPointEventMsg.setUserId(formDTO.getUserId());
+        actPointEventMsg.setSourceType("volunteer");
+        actPointEventMsg.setSourceId(formDTO.getUserId());
         actPointEventMsg.setActionFlag(MqConstant.PLUS);
         actPointEventMsg.setIsCommon(false);
         actPointEventMsgList.add(actPointEventMsg);

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

@@ -927,6 +927,7 @@ public class WorkActServiceImpl implements WorkActService {
             basePointEventMsg.setPoint(actInfoDTO.getReward());
             basePointEventMsg.setIsCommon(true);
             basePointEventMsg.setRemark(remark);
+            basePointEventMsg.setSourceType("activity");
             basePointEventMsg.setSourceId(actInfoDTO.getId());
             basePointEventMsg.setOperatorId(loginUserUtil.getLoginUserId());
             basePointEventMsgArrayList.add(basePointEventMsg);
@@ -966,6 +967,7 @@ public class WorkActServiceImpl implements WorkActService {
         basePointEventMsg.setPoint(formDTO.getReward());
         basePointEventMsg.setIsCommon(true);
         basePointEventMsg.setRemark(formDTO.getRemark());
+        basePointEventMsg.setSourceType("activity");
         basePointEventMsg.setSourceId(formDTO.getSourceId());
         basePointEventMsg.setOperatorId(loginUserUtil.getLoginUserId());
         basePointEventMsgArrayList.add(basePointEventMsg);

epmet-module/epmet-message/epmet-message-client/pom.xml

@@ -30,7 +30,6 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-rocketmq</artifactId>
             <version>2.0.0</version>
-            <scope>compile</scope>
         </dependency>
     </dependencies>
 

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

@@ -15,4 +15,9 @@ public interface SystemMessageType {
      */
     String PROJECT_CHANGED = "project_changed";
 
+    /**
+     * 小组成就
+     */
+    String GROUP_ACHIEVEMENT = "group_achievement";
+
 }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/UserMessageFormDTO.java

@@ -58,7 +58,7 @@ public class UserMessageFormDTO implements Serializable {
 	private String readFlag;
 
 	/**
-	 * 调用者
+	 * 调用者 【分内部调用和外部调用，内部调用值为空，外部默认为：外挂-站内信】
 	 */
 	private String referer;
 }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java

@@ -2,6 +2,7 @@ package com.epmet.send;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
+import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.SystemMessageType;
@@ -66,4 +67,35 @@ public class SendMqMsgUtil {
         return false;
     }
 
+    /**
+     * desc: 发送小组成就消息,计算小组成就
+     *
+     * @param msgContent
+     * @return boolean
+     * @author LiuJanJun
+     * @date 2021/4/23 3:01 下午
+     * @remark 失败重试1次,调用端自行判断如果失败是否要继续执行
+     */
+    public boolean sendGroupAchievementMqMsg(GroupAchievementMQMsg msgContent) {
+        try {
+            SystemMsgFormDTO systemMsgFormDTO = new SystemMsgFormDTO();
+            systemMsgFormDTO.setMessageType(SystemMessageType.GROUP_ACHIEVEMENT);
+            systemMsgFormDTO.setContent(msgContent);
+            Result sendMsgResult = null;
+            log.info("sendGroupAchievementMqMsg param:{}",msgContent);
+            int retryTime = 0;
+            do {
+                sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(systemMsgFormDTO);
+            } while ((sendMsgResult == null || !sendMsgResult.success()) && retryTime++ < NumConstant.TWO);
+
+            if (sendMsgResult != null && sendMsgResult.success()) {
+                return true;
+            }
+            log.error("发送(小组成就)系统消息到message服务失败:{},msg:{}", JSON.toJSONString(sendMsgResult), JSON.toJSONString(systemMsgFormDTO));
+        } catch (Exception e) {
+            log.error("sendMqMsg exception", e);
+        }
+        return false;
+    }
+
 }

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

@@ -67,6 +67,9 @@ public class SystemMessageServiceImpl implements SystemMessageService {
             case SystemMessageType.PROJECT_CHANGED:
                 topic = TopicConstants.PROJECT_CHANGED;
                 break;
+            case SystemMessageType.GROUP_ACHIEVEMENT:
+                topic = TopicConstants.GROUP_ACHIEVEMENT;
+                break;
         }
         return topic;
     }

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/BizPointTotalDetailDTO.java

@@ -0,0 +1,101 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 按业务类型积分总计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-20
+ */
+@Data
+public class BizPointTotalDetailDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 业务类型：小组：group
+     */
+	private String bizType;
+
+    /**
+     * 业务类型的对象id
+     */
+	private String objectId;
+
+    /**
+     * OBJECTID的总积分 总积分=objectId下所有的用户积分
+     */
+	private Integer totalPoint;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/BizPointUserTotalDetailDTO.java

@@ -0,0 +1,106 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 按业务类型积分总计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-20
+ */
+@Data
+public class BizPointUserTotalDetailDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 业务类型：小组：group
+     */
+	private String bizType;
+
+    /**
+     * 业务类型的对象id
+     */
+	private String objectId;
+
+    /**
+     * OBJECTID的总积分 总积分=objectId下所有的用户积分
+     */
+	private Integer totalPoint;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointActionLogDTO.java

@@ -53,6 +53,18 @@ public class UserPointActionLogDTO implements Serializable {
      */
 	private String actionFlag;
 
+	/**
+	 * 业务类型：小组：group
+	 */
+	private String bizType;
+
+	/**
+	 * 业务类型的对象id
+	 */
+	private String objectId;
+
+	private String sourceType;
+
     /**
      * 来源Id，可以是活动Id
      * */

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java

@@ -0,0 +1,17 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/4/21 9:50
+ */
+@Data
+public class GroupPointFormDTO implements Serializable {
+	private static final long serialVersionUID = -3231073030413434313L;
+	private String groupId;
+	private String gridId;
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java

@@ -0,0 +1,38 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/4/21 10:34
+ */
+@NoArgsConstructor
+@Data
+public class GroupPointRankingResultDTO implements Serializable {
+
+	private static final long serialVersionUID = -9215609608003827403L;
+	/**
+	 * 排名
+	 */
+	private String ranking;
+	/**
+	 * 小组名
+	 */
+	private String groupName;
+	/**
+	 * 小组积分
+	 */
+	private String point;
+	/**
+	 * 是否本小组
+	 */
+	private String isMine;
+	/**
+	 * 小组ID
+	 */
+	private String groupId;
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRuleResultDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/4/22 15:15
+ */
+@Data
+public class GroupPointRuleResultDTO implements Serializable {
+	private static final long serialVersionUID = -1651136821935977327L;
+	private List<String> rules;
+	/**
+	 * 个人贡献概述
+	 */
+	private String contriSummary;
+
+	/**
+	 * 小组积分概述
+	 */
+	private String groupSummary;
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointRankingResultDTO.java

@@ -0,0 +1,44 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/4/21 10:05
+ */
+@NoArgsConstructor
+@Data
+public class PointRankingResultDTO implements Serializable {
+
+	private static final long serialVersionUID = -5383837225811609227L;
+	/**
+	 * 头像
+	 */
+	private String headPhoto;
+	/**
+	 * 支部小组-姓名/普通小组-昵称
+	 */
+	private String name;
+	/**
+	 * 积分
+	 */
+	private String point;
+	/**
+	 * 排名
+	 */
+	private String ranking;
+	/**
+	 * 是否本人
+	 */
+	private String isMine;
+	/**
+	 * 用户ID
+	 */
+	@JsonIgnore
+	private String userId;
+}

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

@@ -87,6 +87,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>resi-group-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java

@@ -0,0 +1,96 @@
+package com.epmet.controller;
+
+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.dto.form.GroupPointFormDTO;
+import com.epmet.dto.result.GroupPointRuleResultDTO;
+import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO;
+import com.epmet.dto.result.GroupPointRankingResultDTO;
+import com.epmet.dto.result.PointRankingResultDTO;
+import com.epmet.service.BizPointTotalDetailService;
+import com.epmet.service.BizPointUserTotalDetailService;
+import com.epmet.service.PointRuleService;
+import com.epmet.utils.ModuleConstant;
+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;
+
+/**
+ * @author zhaoqifeng
+ * 小组积分
+ * @date 2021/4/21 9:45
+ */
+@RestController
+@RequestMapping("group/point")
+public class GroupPointController {
+
+	@Autowired
+	private BizPointUserTotalDetailService bizPointUserTotalDetailService;
+	@Autowired
+	private BizPointTotalDetailService bizPointTotalDetailService;
+	@Autowired
+	private PointRuleService pointRuleService;
+
+	/**
+	 * 小组积分贡献榜
+	 *
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.PointRankingResultDTO>>
+	 * @author zhaoqifeng
+	 * @date 2021/4/21 14:02
+	 */
+	@PostMapping("pointranking")
+	public Result<List<PointRankingResultDTO>> pointRanking(@LoginUser TokenDto tokenDto, @RequestBody GroupPointFormDTO formDTO) {
+		List<PointRankingResultDTO> list = bizPointUserTotalDetailService.pointRanking(tokenDto, formDTO);
+		return new Result<List<PointRankingResultDTO>>().ok(list);
+	}
+
+	/**
+	 * 网格小组积分排行
+	 *
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.GroupPointRankingResultDTO>>
+	 * @author zhaoqifeng
+	 * @date 2021/4/21 14:02
+	 */
+	@PostMapping("grouppointranking")
+	public Result<List<GroupPointRankingResultDTO>> groupPointRanking(@RequestBody GroupPointFormDTO formDTO) {
+		List<GroupPointRankingResultDTO> list = bizPointTotalDetailService.groupPointRanking(formDTO);
+		return new Result<List<GroupPointRankingResultDTO>>().ok(list);
+	}
+
+	/**
+	 * 小组积分详情
+	 *
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2021/4/21 14:02
+	 */
+	@PostMapping("pointdetail")
+	public Result<GroupPointDetailResultDTO> pointDetail(@RequestBody GroupPointFormDTO formDTO) {
+		GroupPointDetailResultDTO result = bizPointTotalDetailService.pointDetail(formDTO);
+		return new Result<GroupPointDetailResultDTO>().ok(result);
+	}
+
+	/**
+	 * 小组积分规则
+	 * @author zhaoqifeng
+	 * @date 2021/4/22 15:36
+	 * @param tokenDto
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.GroupPointRuleResultDTO>
+	 */
+	@PostMapping("pointrule")
+	public Result<GroupPointRuleResultDTO> pointRule(@LoginUser TokenDto tokenDto) {
+		GroupPointRuleResultDTO result = pointRuleService.getGroupRule(tokenDto.getCustomerId());
+		result.setContriSummary(ModuleConstant.CONTRI_SUMMARY);
+		result.setGroupSummary(ModuleConstant.GROUP_RULE_SUMMARY);
+		return new Result<GroupPointRuleResultDTO>().ok(result);
+	}
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/BizPointTotalDetailDao.java

@@ -0,0 +1,43 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.BizPointTotalDetailDTO;
+import com.epmet.entity.BizPointTotalDetailEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 按业务类型积分总计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-20
+ */
+@Mapper
+public interface BizPointTotalDetailDao extends BaseDao<BizPointTotalDetailEntity> {
+	/**
+	 * 根据业务类型查找数据
+	 * @author zhaoqifeng
+	 * @date 2021/4/20 16:57
+	 * @param type
+	 * @param objectId
+	 * @return com.epmet.dto.BizPointTotalDetailDTO
+	 */
+	BizPointTotalDetailDTO selectDataByObject(@Param("type")String type, @Param("objectId")String objectId);
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/BizPointUserTotalDetailDao.java

@@ -0,0 +1,44 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.BizPointUserTotalDetailEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 按业务类型积分总计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-20
+ */
+@Mapper
+public interface BizPointUserTotalDetailDao extends BaseDao<BizPointUserTotalDetailEntity> {
+
+	/**
+	 * 获取今日积分增量
+	 * @author zhaoqifeng
+	 * @date 2021/4/21 16:56
+	 * @param type
+	 * @param objectId
+	 * @return java.lang.Integer
+	 */
+	Integer selectIncrease(@Param("type")String type, @Param("objectId")String objectId);
+
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java

@@ -53,4 +53,14 @@ public interface UserPointActionLogDao extends BaseDao<UserPointActionLogEntity>
      * @date 2020.07.31 15:11
     **/
     Integer selectSumByEvent(@Param("userId") String userId, @Param("eventId") String eventId, @Param("sourceId") String sourceId, @Param("customerId") String customerId, @Param("dateCheck") Date dateCheck,@Param("right")Date right);
+
+    /**
+     * 获取今日积分增量
+     * @author zhaoqifeng
+     * @date 2021/4/21 16:56
+     * @param type
+     * @param objectId
+     * @return java.lang.Integer
+     */
+    Integer selectIncrease(@Param("type")String type, @Param("objectId")String objectId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/InvitationAccessRecordEntity.java → epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/BizPointTotalDetailEntity.java

@@ -15,10 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dataaggre.entity.resigroup;
+package com.epmet.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -28,37 +26,46 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- * 邀请链接访问表
+ * 按业务类型积分总计
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-12-25
+ * @since v1.0.0 2021-04-20
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("invitation_access_record")
+@TableName("biz_point_total_detail")
-public class InvitationAccessRecordEntity extends BaseEpmetEntity {
+public class BizPointTotalDetailEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 邀请链接主键group_invitation.id
+     * 客户ID
      */
-	private String invitationId;
+	private String customerId;
 
     /**
-     * 用户idcustomer_user.id
+     * 组织Id
      */
-	private String customerUserId;
+	private String agencyId;
 
     /**
-     * 状态：（已浏览 - viewed 、 同意加入小组 - tried 、 成功入群 - success）
+     * 网格ID
      */
-	private String state;
+	private String gridId;
 
     /**
-	 * 客户ID
+     * 业务类型：小组：group
      */
-	@TableField(fill = FieldFill.INSERT)
+	private String bizType;
-	private String customerId;
+
+    /**
+     * 业务类型的对象id
+     */
+	private String objectId;
+
+    /**
+     * OBJECTID的总积分 总积分=objectId下所有的用户积分
+     */
+	private Integer totalPoint;
 
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/BizPointUserTotalDetailEntity.java

@@ -0,0 +1,76 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 按业务类型积分总计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("biz_point_user_total_detail")
+public class BizPointUserTotalDetailEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 业务类型：小组：group
+     */
+	private String bizType;
+
+    /**
+     * 业务类型的对象id
+     */
+	private String objectId;
+
+    /**
+     * OBJECTID的总积分 总积分=objectId下所有的用户积分
+     */
+	private Integer totalPoint;
+
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointActionLogEntity.java

@@ -58,6 +58,18 @@ public class UserPointActionLogEntity extends BaseEpmetEntity {
      */
 	private String eventId;
 
+	/**
+	 * 业务类型：小组：group
+	 */
+	private String bizType;
+
+	/**
+	 * 业务类型的对象id
+	 */
+	private String objectId;
+
+	private String sourceType;
+
 	/**
 	 * 来源Id，可以是活动Id
 	 * */

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java

@@ -0,0 +1,129 @@
+/**
+ * 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.commons.tools.page.PageData;
+import com.epmet.dto.BizPointTotalDetailDTO;
+import com.epmet.dto.form.GroupPointFormDTO;
+import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO;
+import com.epmet.dto.result.GroupPointRankingResultDTO;
+import com.epmet.entity.BizPointTotalDetailEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 按业务类型积分总计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-20
+ */
+public interface BizPointTotalDetailService extends BaseService<BizPointTotalDetailEntity> {
+
+	/**
+	 * 默认分页
+	 *
+	 * @param params
+	 * @return PageData<BizPointTotalDetailDTO>
+	 * @author generator
+	 * @date 2021-04-20
+	 */
+	PageData<BizPointTotalDetailDTO> page(Map<String, Object> params);
+
+	/**
+	 * 默认查询
+	 *
+	 * @param params
+	 * @return java.util.List<BizPointTotalDetailDTO>
+	 * @author generator
+	 * @date 2021-04-20
+	 */
+	List<BizPointTotalDetailDTO> list(Map<String, Object> params);
+
+	/**
+	 * 单条查询
+	 *
+	 * @param id
+	 * @return BizPointTotalDetailDTO
+	 * @author generator
+	 * @date 2021-04-20
+	 */
+	BizPointTotalDetailDTO get(String id);
+
+	/**
+	 * 默认保存
+	 *
+	 * @param dto
+	 * @return void
+	 * @author generator
+	 * @date 2021-04-20
+	 */
+	void save(BizPointTotalDetailDTO dto);
+
+	/**
+	 * 默认更新
+	 *
+	 * @param dto
+	 * @return void
+	 * @author generator
+	 * @date 2021-04-20
+	 */
+	void update(BizPointTotalDetailDTO dto);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return void
+	 * @author generator
+	 * @date 2021-04-20
+	 */
+	void delete(String[] ids);
+
+	/**
+	 * 根据业务类型查找数据
+	 *
+	 * @param type
+	 * @param objectId
+	 * @return com.epmet.dto.BizPointTotalDetailDTO
+	 * @author zhaoqifeng
+	 * @date 2021/4/20 16:53
+	 */
+	BizPointTotalDetailDTO getDataByObject(String type, String objectId);
+
+	/**
+	 * 小组积分详情
+	 *
+	 * @param formDTO
+	 * @return com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO
+	 * @author zhaoqifeng
+	 * @date 2021/4/21 14:05
+	 */
+	GroupPointDetailResultDTO pointDetail(GroupPointFormDTO formDTO);
+
+	/**
+	 * 网格小组积分排行
+	 *
+	 * @param formDTO
+	 * @return java.util.List<com.epmet.dto.result.GroupPointRankingResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2021/4/21 14:05
+	 */
+	List<GroupPointRankingResultDTO> groupPointRanking(GroupPointFormDTO formDTO);
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointUserTotalDetailService.java

@@ -0,0 +1,143 @@
+/**
+ * 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.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.BizPointUserTotalDetailDTO;
+import com.epmet.dto.form.GroupPointFormDTO;
+import com.epmet.dto.result.PointRankingResultDTO;
+import com.epmet.entity.BizPointUserTotalDetailEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 按业务类型积分总计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-20
+ */
+public interface BizPointUserTotalDetailService extends BaseService<BizPointUserTotalDetailEntity> {
+
+	/**
+	 * 默认分页
+	 *
+	 * @param params
+	 * @return PageData<BizPointUserTotalDetailDTO>
+	 * @author generator
+	 * @date 2021-04-20
+	 */
+	PageData<BizPointUserTotalDetailDTO> page(Map<String, Object> params);
+
+	/**
+	 * 默认查询
+	 *
+	 * @param params
+	 * @return java.util.List<BizPointUserTotalDetailDTO>
+	 * @author generator
+	 * @date 2021-04-20
+	 */
+	List<BizPointUserTotalDetailDTO> list(Map<String, Object> params);
+
+	/**
+	 * 单条查询
+	 *
+	 * @param id
+	 * @return BizPointUserTotalDetailDTO
+	 * @author generator
+	 * @date 2021-04-20
+	 */
+	BizPointUserTotalDetailDTO get(String id);
+
+	/**
+	 * 默认保存
+	 *
+	 * @param dto
+	 * @return void
+	 * @author generator
+	 * @date 2021-04-20
+	 */
+	void save(BizPointUserTotalDetailDTO dto);
+
+	/**
+	 * 默认更新
+	 *
+	 * @param dto
+	 * @return void
+	 * @author generator
+	 * @date 2021-04-20
+	 */
+	void update(BizPointUserTotalDetailDTO dto);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return void
+	 * @author generator
+	 * @date 2021-04-20
+	 */
+	void delete(String[] ids);
+
+
+	/**
+	 * 根据业务类型查找用户数据
+	 *
+	 * @param type
+	 * @param objectId
+	 * @param userId
+	 * @return com.epmet.dto.BizPointTotalDetailDTO
+	 * @author zhaoqifeng
+	 * @date 2021/4/20 16:53
+	 */
+	BizPointUserTotalDetailDTO getDataByObject(String type, String objectId, String userId);
+
+	/**
+	 * 根据业务类型查找积分总和
+	 *
+	 * @param type
+	 * @param objectId
+	 * @return java.lang.Integer
+	 * @author zhaoqifeng
+	 * @date 2021/4/20 17:21
+	 */
+	Integer getTotalByObject(String type, String objectId);
+
+	/**
+	 * 小组积分贡献榜
+	 *
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return java.util.List<com.epmet.dto.result.PointRankingResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2021/4/21 14:06
+	 */
+	List<PointRankingResultDTO> pointRanking(TokenDto tokenDto, GroupPointFormDTO formDTO);
+
+	/**
+	 * 获取今日增量
+	 * @author zhaoqifeng
+	 * @date 2021/4/21 16:41
+	 * @param type
+	 * @param objectId
+	 * @return java.lang.Integer
+	 */
+	Integer getIncrease(String type, String objectId);
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRuleService.java

@@ -24,6 +24,7 @@ import com.epmet.dto.form.PointDetailFormDTO;
 import com.epmet.dto.form.PointRuleFormDTO;
 import com.epmet.dto.form.PointRuleListFormDTO;
 import com.epmet.dto.result.CustomerFunctionResultDTO;
+import com.epmet.dto.result.GroupPointRuleResultDTO;
 import com.epmet.dto.result.PointDetailResultDTO;
 import com.epmet.dto.result.PointRuleResultDTO;
 import com.epmet.entity.PointRuleEntity;
@@ -69,4 +70,13 @@ public interface PointRuleService extends BaseService<PointRuleEntity> {
 	PointRuleEntity getByEventCodeAndCustomerId(String customerId,String eventCode);
 
 	InitPointRuleResultDTO initPointRule();
+
+	/**
+	 * 获取小组积分规则
+	 * @author zhaoqifeng
+	 * @date 2021/4/22 15:20
+	 * @param customerId
+	 * @return com.epmet.dto.result.GroupPointRuleResultDTO
+	 */
+	GroupPointRuleResultDTO getGroupRule(String customerId);
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java

@@ -123,4 +123,14 @@ public interface UserPointActionLogService extends BaseService<UserPointActionLo
      * @date 2020.07.31 13:45
     **/
     void grantPointByEvent(String eventCode,BasePointEventMsg event);
+
+    /**
+     * 获取今日增量
+     * @author zhaoqifeng
+     * @date 2021/4/21 16:41
+     * @param type
+     * @param objectId
+     * @return java.lang.Integer
+     */
+    Integer getIncrease(String type, String objectId);
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java

@@ -0,0 +1,212 @@
+/**
+ * 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.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.constant.NumConstant;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dao.BizPointTotalDetailDao;
+import com.epmet.dto.BizPointTotalDetailDTO;
+import com.epmet.dto.form.GroupPointFormDTO;
+import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO;
+import com.epmet.dto.result.GroupPointRankingResultDTO;
+import com.epmet.entity.BizPointTotalDetailEntity;
+import com.epmet.resi.group.dto.group.ResiGroupDTO;
+import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
+import com.epmet.service.BizPointTotalDetailService;
+import com.epmet.service.BizPointUserTotalDetailService;
+import com.epmet.service.UserPointActionLogService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.Collator;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+/**
+ * 按业务类型积分总计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-20
+ */
+@Service
+public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTotalDetailDao, BizPointTotalDetailEntity> implements BizPointTotalDetailService {
+
+    @Autowired
+    private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
+    @Autowired
+    private BizPointUserTotalDetailService bizPointUserTotalDetailService;
+    @Autowired
+    private UserPointActionLogService userPointActionLogService;
+
+    @Override
+    public PageData<BizPointTotalDetailDTO> page(Map<String, Object> params) {
+        IPage<BizPointTotalDetailEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, BizPointTotalDetailDTO.class);
+    }
+
+    @Override
+    public List<BizPointTotalDetailDTO> list(Map<String, Object> params) {
+        List<BizPointTotalDetailEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, BizPointTotalDetailDTO.class);
+    }
+
+    private QueryWrapper<BizPointTotalDetailEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<BizPointTotalDetailEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public BizPointTotalDetailDTO get(String id) {
+        BizPointTotalDetailEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, BizPointTotalDetailDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(BizPointTotalDetailDTO dto) {
+        BizPointTotalDetailEntity entity = ConvertUtils.sourceToTarget(dto, BizPointTotalDetailEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(BizPointTotalDetailDTO dto) {
+        BizPointTotalDetailEntity entity = ConvertUtils.sourceToTarget(dto, BizPointTotalDetailEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * 根据业务类型查找数据
+     *
+     * @param type
+     * @param objectId
+     * @return com.epmet.dto.BizPointTotalDetailDTO
+     * @author zhaoqifeng
+     * @date 2021/4/20 16:53
+     */
+    @Override
+    public BizPointTotalDetailDTO getDataByObject(String type, String objectId) {
+        return baseDao.selectDataByObject(type, objectId);
+    }
+
+    /**
+     * 小组积分详情
+     *
+     * @param formDTO
+     * @return com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO
+     * @author zhaoqifeng
+     * @date 2021/4/21 14:05
+     */
+    @Override
+    public GroupPointDetailResultDTO pointDetail(GroupPointFormDTO formDTO) {
+        Result<GroupPointDetailResultDTO> result = resiGroupOpenFeignClient.groupPointDetail(formDTO.getGroupId());
+        if (!result.success() || null == result.getData()) {
+            throw new RenException(result.getCode(), result.getMsg());
+        }
+        GroupPointDetailResultDTO detail = result.getData();
+        QueryWrapper<BizPointTotalDetailEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("BIZ_TYPE", "group")
+                .eq("OBJECT_ID", formDTO.getGroupId())
+                .eq("DEL_FLAG", NumConstant.ZERO_STR);
+        BizPointTotalDetailEntity entity = baseDao.selectOne(wrapper);
+        Integer increase = userPointActionLogService.getIncrease("group", formDTO.getGroupId());
+        detail.setIncrease(increase.toString());
+        if (null == entity) {
+            detail.setToUpgrade(detail.getNextLevelPoint());
+            detail.setTotal(NumConstant.ZERO_STR);
+            detail.setCurrentPoint(NumConstant.ZERO_STR);
+        } else {
+            int toUpgrade = Integer.parseInt(detail.getNextLevelPoint()) - entity.getTotalPoint();
+            detail.setToUpgrade(Integer.toString(toUpgrade));
+            detail.setTotal(entity.getTotalPoint().toString());
+            detail.setCurrentPoint(entity.getTotalPoint().toString());
+        }
+        return detail;
+    }
+
+    /**
+     * 网格小组积分排行
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.result.GroupPointRankingResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/4/21 14:05
+     */
+    @Override
+    public List<GroupPointRankingResultDTO> groupPointRanking(GroupPointFormDTO formDTO) {
+        List<GroupPointRankingResultDTO> list;
+        QueryWrapper<BizPointTotalDetailEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("BIZ_TYPE", "group")
+                .eq("GRID_ID", formDTO.getGridId())
+                .eq("DEL_FLAG", NumConstant.ZERO_STR)
+                .orderByDesc("TOTAL_POINT");
+        List<BizPointTotalDetailEntity> totalDetailList = baseDao.selectList(wrapper);
+        Result<List<ResiGroupDTO>> groupList = resiGroupOpenFeignClient.getGroupListByGrid(formDTO.getGridId());
+        list = groupList.getData().stream().map(item -> {
+            GroupPointRankingResultDTO dto = new GroupPointRankingResultDTO();
+            dto.setGroupId(item.getId());
+            dto.setGroupName(item.getGroupName());
+            dto.setPoint(NumConstant.ZERO_STR);
+            if (formDTO.getGroupId().equals(item.getId())) {
+                dto.setIsMine(NumConstant.ONE_STR);
+            } else {
+                dto.setIsMine(NumConstant.ZERO_STR);
+            }
+            return dto;
+        }).collect(Collectors.toList());
+        list.forEach(item -> totalDetailList.stream().filter(detail -> item.getGroupId().equals(detail.getObjectId())).forEach(total -> {
+            item.setPoint(total.getTotalPoint().toString());
+
+        }));
+        list =
+                list.stream().sorted(Comparator.comparing(GroupPointRankingResultDTO :: getPoint, Comparator.comparingInt(Integer::parseInt)).reversed()
+                        .thenComparing(GroupPointRankingResultDTO::getGroupName, Collator.getInstance(Locale.CHINA)))
+                .collect(Collectors.toList());
+        AtomicInteger i = new AtomicInteger(1);
+        list.forEach(dto -> {
+            dto.setRanking(String.valueOf(i.getAndIncrement()));
+        });
+        return list;
+    }
+
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointUserTotalDetailServiceImpl.java

@@ -0,0 +1,251 @@
+/**
+ * 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.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.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.enums.BizTypeEnum;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dao.BizPointUserTotalDetailDao;
+import com.epmet.dto.BizPointUserTotalDetailDTO;
+import com.epmet.dto.form.GroupPointFormDTO;
+import com.epmet.dto.result.PointRankingResultDTO;
+import com.epmet.dto.result.UserBaseInfoResultDTO;
+import com.epmet.entity.BizPointUserTotalDetailEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.resi.group.dto.group.ResiGroupDTO;
+import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
+import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
+import com.epmet.service.BizPointUserTotalDetailService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.Collator;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+/**
+ * 按业务类型积分总计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-20
+ */
+@Service
+public class BizPointUserTotalDetailServiceImpl extends BaseServiceImpl<BizPointUserTotalDetailDao, BizPointUserTotalDetailEntity> implements BizPointUserTotalDetailService {
+
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Autowired
+    private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
+
+    @Override
+    public PageData<BizPointUserTotalDetailDTO> page(Map<String, Object> params) {
+        IPage<BizPointUserTotalDetailEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, BizPointUserTotalDetailDTO.class);
+    }
+
+    @Override
+    public List<BizPointUserTotalDetailDTO> list(Map<String, Object> params) {
+        List<BizPointUserTotalDetailEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, BizPointUserTotalDetailDTO.class);
+    }
+
+    private QueryWrapper<BizPointUserTotalDetailEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<BizPointUserTotalDetailEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public BizPointUserTotalDetailDTO get(String id) {
+        BizPointUserTotalDetailEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, BizPointUserTotalDetailDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(BizPointUserTotalDetailDTO dto) {
+        BizPointUserTotalDetailEntity entity = ConvertUtils.sourceToTarget(dto, BizPointUserTotalDetailEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(BizPointUserTotalDetailDTO dto) {
+        BizPointUserTotalDetailEntity entity = ConvertUtils.sourceToTarget(dto, BizPointUserTotalDetailEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * 根据业务类型查找用户数据
+     *
+     * @param type
+     * @param objectId
+     * @param userId
+     * @return com.epmet.dto.BizPointTotalDetailDTO
+     * @author zhaoqifeng
+     * @date 2021/4/20 16:53
+     */
+    @Override
+    public BizPointUserTotalDetailDTO getDataByObject(String type, String objectId, String userId) {
+        QueryWrapper<BizPointUserTotalDetailEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("BIZ_TYPE", type)
+                .eq("OBJECT_ID", objectId)
+                .eq("USER_ID", userId)
+                .eq("DEL_FLAG", NumConstant.ZERO_STR);
+        BizPointUserTotalDetailEntity entity = baseDao.selectOne(wrapper);
+        return ConvertUtils.sourceToTarget(entity, BizPointUserTotalDetailDTO.class);
+    }
+
+    /**
+     * 根据业务类型查找积分总和
+     *
+     * @param type
+     * @param objectId
+     * @return java.lang.Integer
+     * @author zhaoqifeng
+     * @date 2021/4/20 17:21
+     */
+    @Override
+    public Integer getTotalByObject(String type, String objectId) {
+        QueryWrapper<BizPointUserTotalDetailEntity> wrapper = new QueryWrapper<>();
+        wrapper.select("IFNULL(SUM(TOTAL_POINT), 0) as TOTAL_POINT")
+                .eq("BIZ_TYPE", type)
+                .eq("OBJECT_ID", objectId)
+                .eq("DEL_FLAG", NumConstant.ZERO_STR);
+        BizPointUserTotalDetailEntity entity = baseDao.selectOne(wrapper);
+        if (null == entity) {
+            return NumConstant.ZERO;
+        }
+        return entity.getTotalPoint();
+    }
+
+    public static void main(String[] args) {
+        System.out.println(BizTypeEnum.ACTIVITY.getType());
+    }
+
+    /**
+     * 小组积分贡献榜
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.result.PointRankingResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/4/21 14:06
+     */
+    @Override
+    public List<PointRankingResultDTO> pointRanking(TokenDto tokenDto, GroupPointFormDTO formDTO) {
+        List<PointRankingResultDTO> list = new ArrayList<>();
+        QueryWrapper<BizPointUserTotalDetailEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("BIZ_TYPE", "group")
+                .eq("OBJECT_ID", formDTO.getGroupId())
+                .eq("DEL_FLAG", NumConstant.ZERO_STR)
+                .orderByDesc("TOTAL_POINT");
+        List<BizPointUserTotalDetailEntity> userTotalList = baseDao.selectList(wrapper);
+        AtomicInteger i = new AtomicInteger(1);
+
+        //获取小组信息
+        Result<ResiGroupDTO> group = resiGroupOpenFeignClient.getGroupDetail(formDTO.getGroupId());
+        if (!group.success() || null == group.getData()) {
+            throw new RenException(group.getCode(), group.getMsg());
+        }
+        List<ResiGroupMemberDTO> memberList = group.getData().getMemberList();
+        list = memberList.stream().map(item -> {
+            PointRankingResultDTO dto = new PointRankingResultDTO();
+            dto.setUserId(item.getCustomerUserId());
+            dto.setPoint(NumConstant.ZERO_STR);
+            if (tokenDto.getUserId().equals(item.getCustomerUserId())) {
+                dto.setIsMine(NumConstant.ONE_STR);
+            } else {
+                dto.setIsMine(NumConstant.ZERO_STR);
+            }
+            return dto;
+        }).collect(Collectors.toList());
+        list.forEach(item -> userTotalList.stream().filter(user -> user.getUserId().equals(item.getUserId())).forEach(total -> {
+            item.setPoint(total.getTotalPoint().toString());
+        }));
+        //获取用户信息
+        List<String> userIds = memberList.stream().map(ResiGroupMemberDTO :: getCustomerUserId).collect(Collectors.toList());
+        Result<List<UserBaseInfoResultDTO>> userInfoListResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
+        if (!userInfoListResult.success() || null == userInfoListResult.getData()) {
+            throw new RenException(userInfoListResult.getCode(), userInfoListResult.getMsg());
+        }
+        list.forEach(item -> userInfoListResult.getData().stream().filter(baseInfo -> item.getUserId().equals(baseInfo.getUserId())).forEach(
+                user -> {
+                    //楼院小组显示昵称，支部小组显示姓名
+                    if (("ordinary").equals(group.getData().getGroupType())) {
+                        item.setName(user.getNickname());
+                    } else {
+                        item.setName(StrConstant.EPMETY_STR);
+                        if (StringUtils.isNotBlank(user.getSurname())){
+                            item.setName(user.getSurname());
+                        }
+                        if (StringUtils.isNotBlank(user.getName())){
+                            item.setName(item.getName().concat(user.getName()));
+                        }
+                    }
+                    item.setHeadPhoto(user.getHeadImgUrl());
+                }
+        ));
+        list = list.stream().sorted(Comparator.comparing(PointRankingResultDTO :: getPoint, Comparator.comparingInt(Integer::parseInt)).reversed()
+                        .thenComparing(PointRankingResultDTO::getName, Collator.getInstance(Locale.CHINA)))
+                        .collect(Collectors.toList());
+        list.forEach(item -> item.setRanking(String.valueOf(i.getAndIncrement())));
+        return list;
+    }
+
+    /**
+     * 获取今日增量
+     *
+     * @param type
+     * @param objectId
+     * @return java.lang.Integer
+     * @author zhaoqifeng
+     * @date 2021/4/21 16:41
+     */
+    @Override
+    public Integer getIncrease(String type, String objectId) {
+        return baseDao.selectIncrease(type, objectId);
+    }
+
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java

@@ -206,6 +206,11 @@ public class PointAdjustmentLogServiceImpl extends BaseServiceImpl<PointAdjustme
         userPointActionEntity.setCustomerId(param.getCustomerId());
         userPointActionEntity.setActionFlag(param.getAdjustmentType());
         userPointActionEntity.setPoint(point);
+        userPointActionEntity.setEventId("manual");
+        userPointActionEntity.setBizType("agency");
+        userPointActionEntity.setObjectId(agencyId);
+        userPointActionEntity.setSourceType("manual");
+        userPointActionEntity.setSourceId(param.getUserId());
         userPointActionEntity.setEventStatement(param.getReason());
         userPointActionEntity.setEventName(ModuleConstant.EVENT_NAME_ADJUSTMENT);
         userPointActionEntity.setOperatorAgencyId(agencyId);

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java

@@ -18,6 +18,7 @@
 package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.common.enu.PointUnitEnum;
 import com.epmet.common.enu.SysResponseEnum;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -25,6 +26,7 @@ import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.enums.CommonOperateTypeEnum;
+import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -41,10 +43,7 @@ import com.epmet.dto.form.CustomerFunctionListFormDTO;
 import com.epmet.dto.form.PointDetailFormDTO;
 import com.epmet.dto.form.PointRuleFormDTO;
 import com.epmet.dto.form.PointRuleListFormDTO;
-import com.epmet.dto.result.CustomerFunctionResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.DefaultFunctionListResultDTO;
-import com.epmet.dto.result.PointDetailResultDTO;
-import com.epmet.dto.result.PointRuleResultDTO;
 import com.epmet.entity.PointRuleDefaultEntity;
 import com.epmet.entity.PointRuleEntity;
 import com.epmet.entity.RuleOperateLogEntity;
@@ -61,6 +60,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -284,6 +284,36 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 		return result;
 	}
 
+	/**
+	 * 获取小组积分规则
+	 *
+	 * @param customerId
+	 * @return com.epmet.dto.result.GroupPointRuleResultDTO
+	 * @author zhaoqifeng
+	 * @date 2021/4/22 15:20
+	 */
+	@Override
+	public GroupPointRuleResultDTO getGroupRule(String customerId) {
+		GroupPointRuleResultDTO resultDTO = new GroupPointRuleResultDTO();
+		List<String> list = new ArrayList<>();
+		QueryWrapper<PointRuleEntity> wrapper = new QueryWrapper<>();
+		wrapper.eq("CUSTOMER_ID", customerId)
+		.eq("DEL_FLAG", NumConstant.ZERO_STR);
+		List<PointRuleEntity> ruleList = baseDao.selectList(wrapper);
+		if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(ruleList)) {
+			AtomicInteger index=new AtomicInteger(1);
+			list = ruleList.stream().filter(i -> ("resi_group").equals(Objects.requireNonNull(EventEnum.getEnum(i.getEventCode())).getEventClass())).map(item -> {
+				String rule = index.getAndIncrement() + "." + item.getRuleName() + "，" + "" + item.getPoint() + "分";
+				if (NumConstant.ZERO != item.getUpLimit()) {
+					rule = rule + "（每天最多得" + item.getUpLimit() + "分）";
+				}
+				return rule;
+			}).collect(Collectors.toList());
+		}
+		resultDTO.setRules(list);
+		return resultDTO;
+	}
+
 	private void insertOperateRecord(TokenDto tokenDTO, PointRuleEntity entityNew, PointRuleEntity entityDB, String opType) {
 		RuleOperateLogEntity record = new RuleOperateLogEntity();
 		if (tokenDTO != null) {

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java

@@ -31,17 +31,14 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dao.UserPointActionLogDao;
+import com.epmet.dto.BizPointTotalDetailDTO;
+import com.epmet.dto.BizPointUserTotalDetailDTO;
 import com.epmet.dto.UserPointActionLogDTO;
 import com.epmet.dto.form.CommonPageUserFormDTO;
 import com.epmet.dto.result.ResiPointLogListResultDTO;
 import com.epmet.dto.result.ResiPointLogPeriodResultDTO;
-import com.epmet.entity.PointRuleEntity;
+import com.epmet.entity.*;
-import com.epmet.entity.UserPointActionLogEntity;
+import com.epmet.service.*;
-import com.epmet.entity.UserPointStatisticalDailyEntity;
-import com.epmet.entity.UserPointTotalEntity;
-import com.epmet.service.UserPointActionLogService;
-import com.epmet.service.UserPointStatisticalDailyService;
-import com.epmet.service.UserPointTotalService;
 import com.epmet.utils.DimIdGenerator;
 import com.epmet.utils.ModuleConstant;
 import com.epmet.utils.RuleCycleEnum;
@@ -77,6 +74,10 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
     private UserPointStatisticalDailyService userPointStatisticalDailyService;
     @Autowired
     private PointRuleServiceImpl pointRuleService;
+    @Autowired
+    private BizPointTotalDetailService bizPointTotalDetailService;
+    @Autowired
+    private BizPointUserTotalDetailService bizPointUserTotalDetailService;
     @Override
     public PageData<UserPointActionLogDTO> page(Map<String, Object> params) {
         IPage<UserPointActionLogEntity> page = baseDao.selectPage(
@@ -253,7 +254,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
             if(!StringUtils.equals(ModuleConstant.POINT_UNIT_TIME,ruleInfo.getPointUnit()) && !StringUtils.equals(ModuleConstant.POINT_UNIT_DAY,ruleInfo.getPointUnit())){
                 //其余积分单位
                 //TODO..
-                logger.warn(String.format("当前规则属于按%s计分，系统尚不支持响应此类积分规则的事件"),ruleInfo.getPointUnit());
+                logger.error(String.format("当前规则属于按%s计分，系统尚不支持响应此类积分规则的事件"),ruleInfo.getPointUnit());
                 return ;
             }
 
@@ -263,7 +264,9 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
             if(ruleInfo.getUpLimit() > NumConstant.ZERO){
                 //不按照sourceId查询，查询指定日期内的相关积分规则的总和
                 Integer sum = baseDao.selectSumByEvent(event.getUserId(),eventCode,null,event.getCustomerId(),dateCheck,right);
-                if(null == sum) sum = NumConstant.ZERO;
+                if(null == sum) {
+                    sum = NumConstant.ZERO;
+                }
                 if(StringUtils.equals(ModuleConstant.OPERATION_TYPE_PLUS,ruleInfo.getOperateType())){
                    if(ruleInfo.getPoint() < NumConstant.ZERO){
                        //保证要加的积分是正数
@@ -317,8 +320,16 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
             action.setUserId(event.getUserId());
             action.setCreatedBy(StringUtils.isBlank(event.getOperatorId()) ? ModuleConstant.CREATED_BY_SYSTEM : event.getOperatorId());
             action.setUpdatedBy(StringUtils.isBlank(event.getOperatorId()) ? ModuleConstant.CREATED_BY_SYSTEM : event.getOperatorId());
+            action.setSourceType(event.getSourceType());
             action.setSourceId(event.getSourceId());
             action.setOperatorAgencyId(event.getOpAgencyId());
+            if (("resi_group").equals(event.getEventClass())) {
+                action.setBizType("group");
+                action.setObjectId(event.getGroupId());
+            } else {
+                action.setBizType("activity");
+                action.setObjectId(event.getSourceId());
+            }
             baseDao.insert(action);
             //2.新增/修改用户积分日统计
             DimIdGenerator.DimIdBean dimVal = DimIdGenerator.getDimIdBean(new Date());
@@ -342,15 +353,71 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
             point.setCreatedBy(StringUtils.isBlank(event.getOperatorId()) ? ModuleConstant.CREATED_BY_SYSTEM : event.getOperatorId());
             point.setUpdatedBy(StringUtils.isBlank(event.getOperatorId()) ? ModuleConstant.CREATED_BY_SYSTEM : event.getOperatorId());
             userPointTotalService.insertOrUpdate(point);
+            //
+            if (("resi_group").equals(event.getEventClass())) {
+                //2021.04.20 小组积分统计
+                //个人小组积分
+                BizPointUserTotalDetailDTO userTotalDetailDTO = bizPointUserTotalDetailService.getDataByObject("group", event.getGroupId(),
+                        event.getUserId());
+                Integer userTotal = getUserTotalByObject("group", event.getGroupId(), event.getUserId());
+                if (null == userTotalDetailDTO) {
+                    userTotalDetailDTO = new BizPointUserTotalDetailDTO();
+                    userTotalDetailDTO.setCustomerId(event.getCustomerId());
+                    userTotalDetailDTO.setAgencyId(event.getAgencyId());
+                    userTotalDetailDTO.setGridId(event.getGridId());
+                    userTotalDetailDTO.setUserId(event.getUserId());
+                    userTotalDetailDTO.setBizType("group");
+                    userTotalDetailDTO.setObjectId(event.getGroupId());
+                    userTotalDetailDTO.setTotalPoint(userTotal);
+                    bizPointUserTotalDetailService.save(userTotalDetailDTO);
+                } else {
+                    userTotalDetailDTO.setTotalPoint(userTotal);
+                    userTotalDetailDTO.setUpdatedTime(new Date());
+                    bizPointUserTotalDetailService.update(userTotalDetailDTO);
+                }
+
+                //小组总积分
+                BizPointTotalDetailDTO totalDetailDTO = bizPointTotalDetailService.getDataByObject("group", event.getGroupId());
+                Integer total = getTotalByObject("group", event.getGroupId());
+                if (null == totalDetailDTO) {
+                    totalDetailDTO = new BizPointTotalDetailDTO();
+                    totalDetailDTO.setCustomerId(event.getCustomerId());
+                    totalDetailDTO.setAgencyId(event.getAgencyId());
+                    totalDetailDTO.setGridId(event.getGridId());
+                    totalDetailDTO.setBizType("group");
+                    totalDetailDTO.setObjectId(event.getGroupId());
+                    totalDetailDTO.setTotalPoint(total);
+                    bizPointTotalDetailService.save(totalDetailDTO);
+                } else {
+                    totalDetailDTO.setTotalPoint(total);
+                    totalDetailDTO.setUpdatedTime(new Date());
+                    bizPointTotalDetailService.update(totalDetailDTO);
+                }
+
+            }
 
 
         }else{
-            log.warn(String.format("未检测到该用户下有效的积分规则，消息体->【%s】", JSON.toJSON(event)));
+            log.error(String.format("未检测到该用户下有效的积分规则，消息体->【%s】", JSON.toJSON(event)));
         }
 
 
     }
 
+    /**
+     * 获取今日增量
+     *
+     * @param type
+     * @param objectId
+     * @return java.lang.Integer
+     * @author zhaoqifeng
+     * @date 2021/4/21 16:41
+     */
+    @Override
+    public Integer getIncrease(String type, String objectId) {
+        return baseDao.selectIncrease(type, objectId);
+    }
+
     private void plusPoint(SendPointFormDTO grantPoint) {
         ValidatorUtils.validateEntity(grantPoint, SendPointFormDTO.SendPointGroup.class);
 
@@ -379,6 +446,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
         action.setCreatedBy(grantPoint.getOperatorId());
         action.setUpdatedBy(grantPoint.getOperatorId());
         action.setSourceId(grantPoint.getSourceId());
+        action.setSourceType("activity");
         action.setOperatorAgencyId(grantPoint.getOpAgencyId());
         baseDao.insert(action);
         //2.新增/修改用户积分日统计
@@ -402,4 +470,46 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
         point.setUpdatedBy(grantPoint.getOperatorId());
         userPointTotalService.insertOrUpdate(point);
     }
+
+    private Integer getTotalByObject(String type, String objectId) {
+        QueryWrapper<UserPointActionLogEntity> wrapper = new QueryWrapper<>();
+        wrapper.select("IFNULL(SUM(POINT), 0) as POINT")
+                .eq("BIZ_TYPE", type)
+                .eq("OBJECT_ID", objectId)
+                .eq("ACTION_FLAG", "plus")
+                .eq("DEL_FLAG", NumConstant.ZERO_STR);
+        UserPointActionLogEntity entity1 = baseDao.selectOne(wrapper);
+        int plusTotal = null == entity1? NumConstant.ZERO : entity1.getPoint();
+        wrapper = new QueryWrapper<>();
+        wrapper.select("IFNULL(SUM(POINT), 0) as POINT")
+                .eq("BIZ_TYPE", type)
+                .eq("OBJECT_ID", objectId)
+                .eq("ACTION_FLAG", "minus")
+                .eq("DEL_FLAG", NumConstant.ZERO_STR);
+        UserPointActionLogEntity entity2 = baseDao.selectOne(wrapper);
+        int minusTotal = null == entity2? NumConstant.ZERO : entity2.getPoint();
+        return plusTotal - minusTotal;
+    }
+
+    private Integer getUserTotalByObject(String type, String objectId, String userId) {
+        QueryWrapper<UserPointActionLogEntity> wrapper = new QueryWrapper<>();
+        wrapper.select("IFNULL(SUM(POINT), 0) as POINT")
+                .eq("BIZ_TYPE", type)
+                .eq("OBJECT_ID", objectId)
+                .eq("USER_ID", userId)
+                .eq("ACTION_FLAG", "plus")
+                .eq("DEL_FLAG", NumConstant.ZERO_STR);
+        UserPointActionLogEntity entity1 = baseDao.selectOne(wrapper);
+        int plusTotal = null == entity1? NumConstant.ZERO : entity1.getPoint();
+        wrapper = new QueryWrapper<>();
+        wrapper.select("IFNULL(SUM(POINT), 0) as POINT")
+                .eq("BIZ_TYPE", type)
+                .eq("OBJECT_ID", objectId)
+                .eq("USER_ID", userId)
+                .eq("ACTION_FLAG", "minus")
+                .eq("DEL_FLAG", NumConstant.ZERO_STR);
+        UserPointActionLogEntity entity2 = baseDao.selectOne(wrapper);
+        int minusTotal = null == entity2? NumConstant.ZERO : entity2.getPoint();
+        return plusTotal - minusTotal;
+    }
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java

@@ -122,4 +122,7 @@ public interface ModuleConstant extends Constant {
     String EVENT_NAME_ADD_LIVE = "添加活动实况";
 
     String VERIFICATED_POINT_CAN_NOT_BE_NULL = "核销积分不能为空";
+
+    String GROUP_RULE_SUMMARY = "小组积分是指组内所有成员在本组内活动时所获取的积分总和。";
+    String CONTRI_SUMMARY = "组内贡献是指组内成员在本组进行活动时所获取的积分贡献值。";
 }

epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.10__updateRule.sql

@@ -0,0 +1,3 @@
+UPDATE point_rule_default SET RULE_NAME = '组长转话题为议题' WHERE EVENT_CODE = 'shift_topic_to_issue';
+UPDATE point_rule SET RULE_NAME = '组长转话题为议题' WHERE EVENT_CODE = 'shift_topic_to_issue';
+INSERT INTO `epmet_point`.`point_rule_default`(`ID`, `RULE_NAME`, `RULE_DESC`, `EVENT_CODE`, `FUNCTION_ID`, `OPERATE_TYPE`, `UP_LIMIT`, `UP_LIMIT_DESC`, `UP_LIMIT_PREFIX`, `RULE_PERIOD`, `POINT`, `POINT_UNIT`, `ENABLED_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10', '组长解决话题', '组长解决组内话题', 'leader_resolve_topic', '1', 'plus', 0, '无上限', NULL, 'day', 2, 'time', '0', '0', 0, 'APP_USER', '2021-04-19 15:55:18', 'APP_USER', '2021-04-19 15:55:18');

epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.9__groupPoint.sql

@@ -0,0 +1,40 @@
+CREATE TABLE `biz_point_total_detail` (
+                                          `ID` varchar(64) NOT NULL COMMENT '主键',
+                                          `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+                                          `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织Id',
+                                          `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID',
+                                          `BIZ_TYPE` varchar(64) NOT NULL DEFAULT '0' COMMENT '业务类型：小组：group',
+                                          `OBJECT_ID` varchar(64) NOT NULL DEFAULT '0' COMMENT '业务类型的对象id',
+                                          `TOTAL_POINT` int(11) NOT NULL DEFAULT '0' COMMENT 'OBJECTID的总积分 总积分=objectId下所有的用户积分',
+                                          `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识',
+                                          `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
+                                          `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                          `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                          `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                          `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                          PRIMARY KEY (`ID`) USING BTREE,
+                                          UNIQUE KEY `unx_o_point` (`OBJECT_ID`,`BIZ_TYPE`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='按业务类型积分总计';
+CREATE TABLE `biz_point_user_total_detail` (
+                                               `ID` varchar(64) NOT NULL COMMENT '主键',
+                                               `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+                                               `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织Id',
+                                               `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID',
+                                               `USER_ID` varchar(64) NOT NULL COMMENT '用户ID',
+                                               `BIZ_TYPE` varchar(64) NOT NULL DEFAULT '0' COMMENT '业务类型：小组：group',
+                                               `OBJECT_ID` varchar(64) NOT NULL DEFAULT '0' COMMENT '业务类型的对象id',
+                                               `TOTAL_POINT` int(11) NOT NULL DEFAULT '0' COMMENT 'OBJECTID的总积分 总积分=objectId下所有的用户积分',
+                                               `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识',
+                                               `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
+                                               `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                               `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                               `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                               `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                               PRIMARY KEY (`ID`) USING BTREE,
+                                               UNIQUE KEY `unx_point` (`USER_ID`,`OBJECT_ID`,`BIZ_TYPE`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='按业务类型积分总计';
+
+ALTER TABLE `user_point_action_log`
+    ADD COLUMN `BIZ_TYPE` varchar(64) NULL COMMENT '业务类型：小组：group 活动 activity' AFTER `EVENT_ID`,
+    ADD COLUMN `OBJECT_ID` varchar(64) NULL COMMENT '业务类型的对象id' AFTER `BIZ_TYPE`,
+    ADD COLUMN `SOURCE_TYPE` varchar(20) NULL COMMENT '活动 activity  活动ID\r\n志愿者 volunteer 用户ID\r\n邀请进组 invite 用户ID\r\n话题 topic	话题ID\r\n话题转议题 issue 议题id\r\n话题转项目 project 话题ID' AFTER `OBJECT_ID`;

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/BizPointTotalDetailDao.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.BizPointTotalDetailDao">
+
+    <resultMap type="com.epmet.entity.BizPointTotalDetailEntity" id="bizPointTotalDetailMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="bizType" column="BIZ_TYPE"/>
+        <result property="objectId" column="OBJECT_ID"/>
+        <result property="totalPoint" column="TOTAL_POINT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+    <select id="selectDataByObject" resultType="com.epmet.dto.BizPointTotalDetailDTO">
+        select ID,
+               CUSTOMER_ID,
+               AGENCY_ID,
+               GRID_ID,
+               TOTAL_POINT
+        from biz_point_total_detail
+        where BIZ_TYPE = #{type}
+        and OBJECT_ID = #{objectId}
+    </select>
+
+
+</mapper>

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/BizPointUserTotalDetailDao.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.BizPointUserTotalDetailDao">
+
+    <resultMap type="com.epmet.entity.BizPointUserTotalDetailEntity" id="bizPointUserTotalDetailMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="bizType" column="BIZ_TYPE"/>
+        <result property="objectId" column="OBJECT_ID"/>
+        <result property="totalPoint" column="TOTAL_POINT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+    <select id="selectIncrease" resultType="java.lang.Integer">
+        SELECT IFNULL(SUM(TOTAL_POINT), 0)
+        FROM biz_point_user_total_detail
+        WHERE
+            BIZ_TYPE = #{type}
+            AND OBJECT_ID = #{objectId}
+            AND DATE_FORMAT(CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
+    </select>
+
+
+</mapper>

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml

@@ -28,7 +28,11 @@
         SELECT DISTINCT FUNCTION_ID FROM point_rule WHERE CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
     </select>
     <select id="selectListByFunctionId" resultMap="pointRuleMap">
-         SELECT ID,RULE_NAME,RULE_DESC,POINT,POINT_UNIT,ENABLED_FLAG FROM point_rule WHERE CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} AND FUNCTION_ID = #{functionId,jdbcType=VARCHAR}
+         SELECT ID,RULE_NAME,RULE_DESC,POINT,POINT_UNIT,ENABLED_FLAG FROM point_rule
+         WHERE
+            CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
+            AND FUNCTION_ID = #{functionId,jdbcType=VARCHAR}
+            AND DEL_FLAG = '0'
     </select>
     <update id="updateByCustomerId">
         UPDATE point_rule

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml

@@ -65,4 +65,12 @@
                 AND CREATED_TIME <![CDATA[ < ]]> #{right}
             </if>
     </select>
+    <select id="selectIncrease" resultType="java.lang.Integer">
+        SELECT IFNULL(SUM(POINT), 0)
+        FROM USER_POINT_ACTION_LOG
+        WHERE
+            BIZ_TYPE = #{type}
+          AND OBJECT_ID = #{objectId}
+          AND DATE_FORMAT(CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
+    </select>
 </mapper>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java

@@ -51,8 +51,10 @@ public class WxLoginServiceImpl implements WxLoginService {
 		String resultStr = HttpClientManager.getInstance().sendGet(WxLoginConstant.WXCODE_BY_OPENID, map).getData();
 		HashMap<String, String> hashMap = JSON.parseObject(resultStr, HashMap.class);
 		if (null != hashMap.get("errcode")) {
-			logger.error("wxcode换取openid接口调用失败");
+			//45011:API 调用太频繁，请稍候再试;40029:	code 无效 【错误码：https://developers.weixin.qq.com/doc/oplatform/Return_codes/Return_code_descriptions_new.html】
-			throw new RenException(hashMap.get("errmsg"));
+			throw new RenException(String.format("wxcode换取用户基本信息失败，wxcode->%s,错误码->%s,错误信息->%s", wxCode, hashMap.get("errcode"), hashMap.get("errmsg")));
+			/*logger.error("wxcode换取openid接口调用失败");
+			throw new RenException(hashMap.get("errmsg"));*/
 		}
 		String openid = hashMap.get("openid");
 		String sessionKey = hashMap.get("session_key");

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/ActDetailGovResultDTO.java

@@ -0,0 +1,146 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.dto.form.FileCommonDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 工作端小组内，活动详情返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/29 9:30
+ */
+@Data
+public class ActDetailGovResultDTO implements Serializable {
+    private static final long serialVersionUID = 3982724635100043221L;
+
+    private String groupActId;
+
+    /**
+     * 小组id
+     */
+    private String groupId;
+
+    /**
+     * 活动标题；
+     */
+    private String title;
+
+    /**
+     * 活动时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date startTime;
+
+    /**
+     * 活动所属类别编码
+     */
+    private String categoryCode;
+
+    /**
+     * 上级类别编码
+     */
+    private String parentCode;
+
+    private String menuCode;
+
+    /**
+     * 活动类别名称；eg：支部建设-三会一课
+     */
+    private String allCategoryName;
+
+    /**
+     * 活动地点
+     */
+    private String address;
+
+    /**
+     * 应参加人数组长填入；此列也是应签到人数；
+     */
+    private Integer shouldAttend;
+
+    /**
+     * 活动状态：已发布：published;已取消：canceled；已变更：changed；已关闭：closed
+     */
+    private String status;
+
+    /**
+     * 签到开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date signInStartTime;
+
+    /**
+     * 签到截止时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date signInEndTime;
+
+    /**
+     * 是否填写总结？1：已填写；0：未填写
+     */
+    private Integer summaryFlag;
+
+    /**
+     * 取消时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date canceledTime;
+
+    /**
+     * 关闭时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date closedTime;
+
+    /**
+     * 活动发布人用户id
+     */
+    private String publishUserId;
+
+    /**
+     * 内容列表
+     */
+    private List<String> textList;
+
+    /**
+     * 图片列表
+     */
+    private List<String> imgArrayList;
+
+    /**
+     * 图片列表，最多3张
+     */
+    private List<FileCommonDTO> imgList;
+
+    //以下字段需要单独赋值
+    /**
+     * 取消原因
+     */
+    private String canceledReason;
+
+    /**
+     * 已签到人数（有人签到自动+1）
+     */
+    private Integer signedInNum;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
+    /**
+     * 最后一次编辑时间；首次发布与CREATED_TIME一致
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date changedTime;
+}

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java

@@ -2,15 +2,15 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 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.result.ActDetailGovResultDTO;
+import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
 import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.result.*;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
-import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.ResiGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -175,5 +175,19 @@ public class ResiGroupController {
 		return groupOpenFeignClient.govAuditEdit(param);
 	}
 
-
+	/**
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.act.result.ActDetailResultDTO>
+	 * @param tokenDto
+	 * @param actDetailFormDTO
+	 * @author yinzuomei
+	 * @description 工作端查看小组内活动详情
+	 * @Date 2021/4/29 9:38
+	 **/
+	@PostMapping("actdetail")
+	public Result<ActDetailGovResultDTO> queryActDetailForWork(@LoginUser TokenDto tokenDto, @RequestBody ActDetailFormDTO actDetailFormDTO){
+		actDetailFormDTO.setUserId(tokenDto.getUserId());
+		actDetailFormDTO.setClient(AppClientConstant.APP_GOV);
+		ValidatorUtils.validateEntity(actDetailFormDTO,ActDetailFormDTO.AddUserInternalGroup.class);
+		return new Result<ActDetailGovResultDTO>().ok(resiGroupService.queryActDetailForWork(actDetailFormDTO));
+	}
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java

@@ -6,8 +6,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
 import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO;
+import com.epmet.resi.group.dto.topic.form.AllMessagesFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
+import com.epmet.resi.group.dto.topic.result.AllMessagesResultDTO;
 import com.epmet.resi.group.dto.topic.result.GovHiddenTopicInfoResultDTO;
 import com.epmet.resi.group.dto.topic.result.GovTopicInfoResultDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
@@ -70,6 +72,18 @@ public class ResiTopicController {
         return resiTopicService.topicDetail(topicDetailFormDTO);
     }
 
-
+    /**
+     * @Description  小组内所有历史消息【话题，通知，活动】
+     * @Param tokenDto
+     * @Param topicPageFormDTO
+     * @author zxc
+     * @date 2021/4/28 上午10:41
+     */
+    @PostMapping("allmessages")
+    public Result<List<AllMessagesResultDTO>> allMessages(@LoginUser TokenDto tokenDto, @RequestBody AllMessagesFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, AllMessagesFormDTO.AllMessagesForm.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<List<AllMessagesResultDTO>>().ok(resiTopicService.allMessages(formDTO));
+    }
 
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java

@@ -6,6 +6,8 @@ import com.epmet.controller.TestFormDTO1;
 import com.epmet.controller.TestResultDTO1;
 import com.epmet.dto.result.GridProcessingCountResultDTO;
 import com.epmet.feign.fallback.ResiGroupFeignClientFallBack;
+import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
+import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
 import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
 import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
 import com.epmet.resi.group.dto.group.form.*;
@@ -151,4 +153,14 @@ public interface ResiGroupFeignClient {
 
 	@PostMapping(value = "/resi/group/group/test",consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<TestResultDTO1> test(@RequestBody TestFormDTO1 testFormDTO1);
+
+	/**
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.act.result.ActDetailResultDTO>
+	 * @param actDetailFormDTO
+	 * @author yinzuomei
+	 * @description 查询活动详情
+	 * @Date 2021/4/29 9:57
+	 **/
+	@PostMapping(value = "/resi/group/act/actdetail-internal",consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<ActDetailResultDTO> queryActDetailInternal(@RequestBody ActDetailFormDTO actDetailFormDTO);
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java

@@ -7,6 +7,8 @@ import com.epmet.controller.TestFormDTO1;
 import com.epmet.controller.TestResultDTO1;
 import com.epmet.dto.result.GridProcessingCountResultDTO;
 import com.epmet.feign.ResiGroupFeignClient;
+import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
+import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
 import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
 import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
 import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
@@ -120,4 +122,16 @@ public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
 	public Result<TestResultDTO1> test(TestFormDTO1 testFormDTO1) {
 		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "test", testFormDTO1);
 	}
+
+	/**
+	 * @param actDetailFormDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.act.result.ActDetailResultDTO>
+	 * @author yinzuomei
+	 * @description 查询活动详情
+	 * @Date 2021/4/29 9:57
+	 **/
+	@Override
+	public Result<ActDetailResultDTO> queryActDetailInternal(ActDetailFormDTO actDetailFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "queryActDetailInternal", actDetailFormDTO);
+	}
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiGroupService.java

@@ -1,10 +1,10 @@
 package com.epmet.service;
 
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
+import com.epmet.dto.result.ActDetailGovResultDTO;
-import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
+import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
-import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.group.form.*;
+import com.epmet.resi.group.dto.group.result.*;
 
 import java.util.List;
 
@@ -74,4 +74,5 @@ public interface ResiGroupService {
 	 **/
 	Result disagreeApplying(DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO);
 
+	ActDetailGovResultDTO queryActDetailForWork(ActDetailFormDTO actDetailFormDTO);
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java

@@ -3,8 +3,10 @@ package com.epmet.service;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
 import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO;
+import com.epmet.resi.group.dto.topic.form.AllMessagesFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
+import com.epmet.resi.group.dto.topic.result.AllMessagesResultDTO;
 import com.epmet.resi.group.dto.topic.result.GovHiddenTopicInfoResultDTO;
 import com.epmet.resi.group.dto.topic.result.GovTopicInfoResultDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
@@ -53,5 +55,13 @@ public interface ResiTopicService {
      **/
     Result<List<GovCommentResultDTO>> topicComments(ResiQueryCommentFormDTO queryCommentFormDTO);
 
+    /**
+     * @Description  小组内所有历史消息【话题，通知，活动】
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/4/28 下午1:29
+     */
+    List<AllMessagesResultDTO> allMessages(AllMessagesFormDTO formDTO);
+
 
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java

@@ -1,11 +1,14 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.ActDetailGovResultDTO;
 import com.epmet.feign.ResiGroupFeignClient;
-import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
+import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
-import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
+import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
-import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.group.form.*;
+import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.service.ResiGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -57,5 +60,15 @@ public class ResiGroupServiceImpl implements ResiGroupService{
 		return resiGroupFeignClient.disagreeApplying(disAgreeApplyGroupFormDTO);
 	}
 
+	@Override
+	public ActDetailGovResultDTO queryActDetailForWork(ActDetailFormDTO actDetailFormDTO) {
+		Result<ActDetailResultDTO> actDetailResult=resiGroupFeignClient.queryActDetailInternal(actDetailFormDTO);
+		if(actDetailResult.success()&&null!=actDetailResult.getData()){
+			ActDetailGovResultDTO resultDTO= ConvertUtils.sourceToTarget(actDetailResult.getData(),ActDetailGovResultDTO.class);
+			return resultDTO;
+		}
+		throw new RenException("调用resi-group服务，查询活动详情异常");
+	}
+
 
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java

@@ -1,20 +1,21 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.feign.ResiGroupFeignClient;
 import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
 import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO;
 import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
+import com.epmet.resi.group.dto.topic.form.AllMessagesFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
-import com.epmet.resi.group.dto.topic.result.GovHiddenTopicInfoResultDTO;
+import com.epmet.resi.group.dto.topic.result.*;
-import com.epmet.resi.group.dto.topic.result.GovTopicInfoResultDTO;
+import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
-import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
-import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
 import com.epmet.service.ResiTopicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,6 +25,8 @@ public class ResiTopicServiceImpl implements ResiTopicService {
 
     @Autowired
     private ResiGroupFeignClient resiGroupFeignClient;
+    @Autowired
+    private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
 
     /**
      * @Description 政府端群组管理-屏蔽话题列表查询
@@ -125,4 +128,22 @@ public class ResiTopicServiceImpl implements ResiTopicService {
 
         return new Result<List<GovCommentResultDTO>>().ok(commentsResult);
     }
+
+    /**
+     * @Description  小组内所有历史消息【话题，通知，活动】
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/4/28 下午1:29
+     */
+    @Override
+    public List<AllMessagesResultDTO> allMessages(AllMessagesFormDTO formDTO) {
+        Result<List<AllMessagesResultDTO>> listResult = resiGroupOpenFeignClient.allMessages(formDTO);
+        if (!listResult.success()){
+            throw new RenException(listResult.getMsg());
+        }
+        if (CollectionUtils.isEmpty(listResult.getData())){
+            return new ArrayList<>();
+        }
+        return listResult.getData();
+    }
 }

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

@@ -301,4 +301,12 @@ public interface GovIssueOpenFeignClient {
 	 **/
 	@PostMapping(value = "/gov/issue/issueprojectcategorydict/getcategorytaglist")
 	Result<CategoryTagResultDTO> getCategoryTagList(@RequestBody CategoryTagListFormDTO formDTO);
+
+	/**
+	 * @param customerId
+	 * @Description  根据客户Id获取 议题列表
+	 * @Author sun
+	 **/
+	@PostMapping(value = "/gov/issue/issue/getissuelist")
+	Result<List<IssueDTO>> getIssueList(@RequestParam String customerId);
 }

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

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

epmet-module/gov-issue/gov-issue-server/pom.xml

@@ -216,7 +216,6 @@
 
                 <!--rocketmq-->
                 <rocketmq.nameserver>192.168.1.130:9876;192.168.1.132:9876</rocketmq.nameserver>
-                <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
         <profile>

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

@@ -12,10 +12,7 @@ import com.epmet.resi.group.dto.group.result.GroupVotingListResultDTO;
 import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
 import com.epmet.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-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;
 
@@ -246,5 +243,18 @@ public class IssueController {
         return new Result<List<GroupClosedListResultDTO>>().ok(issueService.getClosedListByGroup(formDTO));
     }
 
+   /**
+    * desc: 获取议题列表
+    *
+    * @param customerId
+    * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.IssueDTO>>
+    * @author LiuJanJun
+    * @date 2021/4/27 10:19 上午
+    */
+    @PostMapping("getissuelist")
+    public Result<List<IssueDTO>> getIssueList(@RequestParam String customerId) {
+        return new Result<List<IssueDTO>>().ok(issueService.getIssueList(customerId));
+    }
+
 }
 

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

@@ -315,4 +315,14 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @return java.util.List<com.epmet.resi.group.dto.group.result.GroupClosedListResultDTO>
      */
     List<GroupClosedListResultDTO> getClosedListByGroup(AllIssueFormDTO formDTO);
+
+    /**
+     * desc: 根据客户Id获取议题列表
+     *
+     * @param customerId
+     * @return java.util.List<com.epmet.dto.IssueDTO>
+     * @author LiuJanJun
+     * @date 2021/4/27 10:23 上午
+     */
+    List<IssueDTO> getIssueList(String customerId);
 }

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

@@ -5,6 +5,7 @@ import com.alibaba.nacos.client.utils.StringUtils;
 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.GroupAchievementMQMsg;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -27,14 +28,15 @@ import com.epmet.dao.IssueDao;
 import com.epmet.dao.IssueProcessDao;
 import com.epmet.dao.IssueProjectRelationDao;
 import com.epmet.dto.*;
-import com.epmet.dto.form.*;
 import com.epmet.dto.form.IssueAuditionFormDTO;
 import com.epmet.dto.form.IssueShiftedFromTopicFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IssueEntity;
 import com.epmet.entity.IssueProcessEntity;
 import com.epmet.entity.IssueProjectRelationEntity;
 import com.epmet.feign.*;
+import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.redis.GovIssueRedis;
 import com.epmet.redis.IssueVoteDetailRedis;
 import com.epmet.resi.group.dto.group.form.AllIssueFormDTO;
@@ -44,10 +46,11 @@ import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupShiftProjectListResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupVotingListResultDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
-import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO;
+import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
+import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.*;
 import com.epmet.utils.ModuleConstants;
 import com.github.pagehelper.PageHelper;
@@ -553,7 +556,12 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         //}
         //applicationService.update(app2update);
 
-
+        //发送小组成就消息
+        boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient)
+                .sendGroupAchievementMqMsg(new GroupAchievementMQMsg(application.getCustomerId(), application.getGroupId(), AchievementTypeEnum.TOISSUE.getCode()));
+        if (!flag) {
+            logger.error("发送(小组成就)系统消息到message服务失败");
+        }
         return app2update.getIssueId();
     }
 
@@ -1387,4 +1395,17 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 		return baseDao.selectClosedListByTopic(formDTO);
 	}
 
+    @Override
+    public List<IssueDTO> getIssueList(String customerId) {
+	    QueryWrapper<IssueEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda()
+                .eq(IssueEntity::getCustomerId,customerId)
+                .eq(IssueEntity::getDelFlag,NumConstant.ZERO_STR);
+        List<IssueEntity> issueEntities = baseDao.selectList(queryWrapper);
+        if (CollectionUtils.isEmpty(issueEntities)){
+            return  null;
+        }
+        return ConvertUtils.sourceToTarget(issueEntities,IssueDTO.class);
+    }
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoResultDTO.java

@@ -87,5 +87,10 @@ public class GridInfoResultDTO implements Serializable {
      * 网格所属机关名称
      */
     private String parentAgencyName;
+
+    /**
+     * 网格的所有上级组织
+     */
+    private String pids;
 }
 

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

@@ -2,6 +2,7 @@ package com.epmet.mq;
 
 import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
 import com.epmet.commons.rocketmq.constants.TopicConstants;
+import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.mq.listener.InitCustomerOrgRolesListener;
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 import org.apache.rocketmq.client.consumer.listener.MessageListener;
@@ -14,7 +15,8 @@ import javax.annotation.PostConstruct;
 
 @Component
 public class RocketMQConsumerRegister {
-
+    @Value("${spring.profiles.active}")
+    private String env;
     @Value("${rocketmq.name-server}")
     private String nameServer;
 
@@ -27,7 +29,9 @@ public class RocketMQConsumerRegister {
     @PostConstruct
     public void registerAllListeners() {
         try {
+            if (!EnvEnum.LOCAL.getCode().equals(env)) {
                 register(nameServer, ConsomerGroupConstants.INIT_CUSTOMER_ORG_ROLES_GROUP, MessageModel.CLUSTERING, TopicConstants.INIT_CUSTOMER, "*", new InitCustomerOrgRolesListener());
+            }
         } catch (MQClientException e) {
             e.printStackTrace();
         }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/listener/InitCustomerOrgListener.java

@@ -1,100 +0,0 @@
-package com.epmet.mq.listener;
-
-import com.alibaba.fastjson.JSON;
-import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
-import com.epmet.commons.rocketmq.constants.TopicConstants;
-import com.epmet.commons.rocketmq.messages.InitCustomerMQMsg;
-import com.epmet.commons.tools.distributedlock.DistributedLock;
-import com.epmet.commons.tools.exception.ExceptionUtils;
-import com.epmet.commons.tools.exception.RenException;
-import com.epmet.constant.UserWorkType;
-import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.dto.form.AddAgencyAndStaffFormDTO;
-import com.epmet.dto.form.AdminStaffFromDTO;
-import com.epmet.service.AgencyService;
-import org.apache.rocketmq.common.message.MessageExt;
-import org.apache.rocketmq.spring.annotation.MessageModel;
-import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
-import org.apache.rocketmq.spring.core.RocketMQListener;
-import org.redisson.api.RLock;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * 监听初始化客户动作，为客户初始化角色列表
- */
-//@RocketMQMessageListener(topic = TopicConstants.INIT_CUSTOMER,
-//        consumerGroup = ConsomerGroupConstants.INIT_CUSTOMER_ORG_ROLES_GROUP,
-//        messageModel = MessageModel.CLUSTERING,
-//        selectorExpression = "*")
-//@Component
-public class InitCustomerOrgListener implements RocketMQListener<MessageExt> {
-
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private AgencyService agencyService;
-
-    @Autowired
-    private DistributedLock distributedLock;
-
-    @Override
-    public void onMessage(MessageExt messageExt) {
-        String msg = new String(messageExt.getBody());
-        logger.info("初始化客户-初始化组织信息-收到消息内容:{}", msg);
-        InitCustomerMQMsg msgObj = JSON.parseObject(msg, InitCustomerMQMsg.class);
-
-        RLock lock = null;
-        try {
-            lock = distributedLock.getLock(String.format("lock:init_customer_org:%s", msgObj.getCustomerId()),
-                    30l, 30l, TimeUnit.SECONDS);
-            agencyService.saveRootAgency(constructRootAndAgencyDTO(msgObj));
-        } catch (RenException e) {
-            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
-            logger.error("【RocketMQ】初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
-        } catch (Exception e) {
-            // 不是我们自己抛出的异常，可以让MQ重试
-            logger.error("【RocketMQ】初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
-            throw e;
-        } finally {
-            distributedLock.unLock(lock);
-        }
-    }
-
-    /**
-     * @Description 构造dto
-     * @return
-     * @author wxz
-     * @date 2021.01.06 15:03
-    */
-    private AddAgencyAndStaffFormDTO constructRootAndAgencyDTO(InitCustomerMQMsg msgObj) {
-        AddAgencyAndStaffFormDTO agencyAndStaff = new AddAgencyAndStaffFormDTO();
-        //客户组织信息
-        CustomerAgencyDTO agencyDTO = new CustomerAgencyDTO();
-        agencyDTO.setId(msgObj.getAgency().getAgencyId());
-        agencyDTO.setCustomerId(msgObj.getCustomerId());
-        agencyDTO.setOrganizationName(msgObj.getAgency().getOrganizationName());
-        agencyDTO.setLevel(msgObj.getAgency().getLevel());
-        agencyDTO.setAreaCode(msgObj.getAgency().getAreaCode());
-        agencyDTO.setProvince(msgObj.getAgency().getProvince());
-        agencyDTO.setCity(msgObj.getAgency().getCity());
-        agencyDTO.setDistrict(msgObj.getAgency().getDistrict());
-        agencyAndStaff.setAgencyDTO(agencyDTO);
-
-        //客户管理员信息
-        AdminStaffFromDTO staffSubmitFrom = new AdminStaffFromDTO();
-        staffSubmitFrom.setCustomerId(msgObj.getCustomerId());
-        staffSubmitFrom.setAgencyId(msgObj.getStaff().getAgencyId());
-        staffSubmitFrom.setGender(msgObj.getStaff().getGender());
-        staffSubmitFrom.setMobile(msgObj.getStaff().getMobile());
-        staffSubmitFrom.setName(msgObj.getStaff().getName());
-        staffSubmitFrom.setWorkType(UserWorkType.FULL_TIME);
-        agencyAndStaff.setStaffDTO(staffSubmitFrom);
-
-        return agencyAndStaff;
-    }
-}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/listener/InitCustomerOrgRolesListener.java

@@ -23,11 +23,12 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 /**
+ * @author wxz
  * @Description 创建客户-组织和角色监听器
  * @return
- * @author wxz
  * @date 2021.03.03 16:10
  */
+//@Component
 public class InitCustomerOrgRolesListener implements MessageListenerConcurrently {
 
     private Logger logger = LoggerFactory.getLogger(getClass());
@@ -53,7 +54,7 @@ public class InitCustomerOrgRolesListener implements MessageListenerConcurrently
         try {
             distributedLock = SpringContextUtils.getBean(DistributedLock.class);
             lock = distributedLock.getLock(String.format("lock:init_customer_org:%s", msgObj.getCustomerId()),
-                    30l, 30l, TimeUnit.SECONDS);
+                    30L, 30L, TimeUnit.SECONDS);
             SpringContextUtils.getBean(AgencyService.class).saveRootAgency(constructRootAndAgencyDTO(msgObj));
         } catch (RenException e) {
             // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
@@ -68,8 +69,8 @@ public class InitCustomerOrgRolesListener implements MessageListenerConcurrently
     }
 
     /**
-     * @Description 构造dto
      * @return
+     * @Description 构造dto
      * @author wxz
      * @date 2021.01.06 15:03
      */
@@ -99,4 +100,14 @@ public class InitCustomerOrgRolesListener implements MessageListenerConcurrently
 
         return agencyAndStaff;
     }
+
+   /* @Override
+    public ConsumerConfigProperties getConsumerProperty() {
+        ConsumerConfigProperties configProperties = new ConsumerConfigProperties();
+        configProperties.setConsumerGroup(ConsomerGroupConstants.INIT_CUSTOMER_ORG_ROLES_GROUP);
+        configProperties.setTopic(TopicConstants.INIT_CUSTOMER);
+        configProperties.setTag("*");
+        configProperties.setConsumerListener(this);
+        return configProperties;
+    }*/
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -486,6 +486,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         gridInfoResultDTO.setGridName(customerGridDTO.getGridName());
         gridInfoResultDTO.setParentAgencyId(customerGridDTO.getPid());
         gridInfoResultDTO.setParentAgencyName(customerAgencyService.get(customerGridDTO.getPid()).getOrganizationName());
+        gridInfoResultDTO.setPids(customerGridDTO.getPids());
         String pids=customerGridDTO.getPids();
         String[] pidArray = pids.split(":");
         for(String agencyId:pidArray){

epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml

@@ -69,6 +69,8 @@
         <if test='customerName != "" and customerName != null'>
             AND customer_name LIKE concat('%', trim(#{customerName}), '%')
         </if>
+        ORDER BY
+            created_time DESC
     </select>
 
     <select id="getAllList" resultMap="customerMap">
@@ -106,19 +108,21 @@
 
     <select id="selectAllCustomerList" resultType="com.epmet.dto.result.CustomerListResultDTO">
         SELECT
-        ID AS "customerId",
+            id AS "customerId",
-        CUSTOMER_NAME,
+            customer_name,
-        TITLE,
+            title,
-        VALIDITY_TIME,
+            validity_time,
-        ORGANIZATION_LEVEL,
+            organization_level,
-        LOGO,
+            logo,
-        GRID_NUMBER
+            grid_number
         FROM customer
         WHERE
-        DEL_FLAG = '0'
+            del_flag = '0'
         <if test='customerName != "" and customerName != null'>
             AND customer_name LIKE concat('%', trim(#{customerName}), '%')
         </if>
+        ORDER BY
+            created_time DESC
     </select>
 
     <select id="getExternalAndParentCustomerId" resultType="String">

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/mq/listener/InitCustomerComponentsListener.java

@@ -15,6 +15,7 @@ import org.apache.rocketmq.common.message.MessageExt;
 import org.redisson.api.RLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -22,6 +23,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * 监听初始化客户动作，为客户初始化角色列表
  */
+//@Component
 public class InitCustomerComponentsListener implements MessageListenerConcurrently {
 
     private Logger logger = LoggerFactory.getLogger(getClass());
@@ -65,4 +67,14 @@ public class InitCustomerComponentsListener implements MessageListenerConcurrent
             distributedLock.unLock(lock);
         }
     }
+
+   /* @Override
+    public ConsumerConfigProperties getConsumerProperty() {
+        ConsumerConfigProperties configProperties = new ConsumerConfigProperties();
+        configProperties.setConsumerGroup(ConsomerGroupConstants.INIT_CUSTOMER_COMPONENTS_GROUP);
+        configProperties.setTopic(TopicConstants.INIT_CUSTOMER);
+        configProperties.setTag("*");
+        configProperties.setConsumerListener(this);
+        return configProperties;
+    }*/
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/mq/listener/InitCustomerCustomizeListener.java

@@ -1,68 +0,0 @@
-package com.epmet.mq.listener;
-
-import com.alibaba.fastjson.JSON;
-import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
-import com.epmet.commons.rocketmq.constants.TopicConstants;
-import com.epmet.commons.rocketmq.messages.InitCustomerMQMsg;
-import com.epmet.commons.tools.distributedlock.DistributedLock;
-import com.epmet.commons.tools.exception.ExceptionUtils;
-import com.epmet.commons.tools.exception.RenException;
-import com.epmet.dto.CustomerHomeDTO;
-import com.epmet.service.CustomerHomeService;
-import org.apache.rocketmq.common.message.MessageExt;
-import org.apache.rocketmq.spring.annotation.MessageModel;
-import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
-import org.apache.rocketmq.spring.core.RocketMQListener;
-import org.redisson.api.RLock;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * 监听初始化客户动作，为客户初始化角色列表
- * 已废弃
- */
-//@RocketMQMessageListener(topic = TopicConstants.INIT_CUSTOMER,
-//        consumerGroup = ConsomerGroupConstants.INIT_CUSTOMER_COMPONENTS_GROUP,
-//        messageModel = MessageModel.CLUSTERING,
-//        selectorExpression = "*")
-//@Component
-public class InitCustomerCustomizeListener implements RocketMQListener<MessageExt> {
-
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private CustomerHomeService customerHomeService;
-
-    @Autowired
-    private DistributedLock distributedLock;
-
-    @Override
-    public void onMessage(MessageExt messageExt) {
-        String msg = new String(messageExt.getBody());
-        logger.info("初始化客户-初始化客户自定义信息-收到消息内容:{}", msg);
-        InitCustomerMQMsg msgObj = JSON.parseObject(msg, InitCustomerMQMsg.class);
-
-        CustomerHomeDTO customerHomeDTO = new CustomerHomeDTO();
-        customerHomeDTO.setCustomerId(msgObj.getCustomerId());
-
-        RLock lock = null;
-        try {
-            lock = distributedLock.getLock(String.format("lock:init_customer_home:%s", msgObj.getCustomerId()),
-                    30l, 30l, TimeUnit.SECONDS);
-            customerHomeService.init(customerHomeDTO);
-        } catch (RenException e) {
-            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
-            logger.error("【RocketMQ】初始化客户组件失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
-        } catch (Exception e) {
-            // 不是我们自己抛出的异常，可以让MQ重试
-            logger.error("【RocketMQ】初始化客户组件失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
-             throw e;
-        } finally {
-            distributedLock.unLock(lock);
-        }
-    }
-}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java

@@ -117,4 +117,7 @@ public interface TopicConstant {
      * 字段 附件类型 大写 下划线
      */
     String FIELD_TOPIC_ATTACHMENT_TYPE = "ATTACHMENT_TYPE";
+
+    String RESOLVED = "resolved";
+    String MEMBER = "member";
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCategoryDictDTO.java

@@ -0,0 +1,102 @@
+/**
+ * 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.resi.group.dto.act;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 活动类别字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+public class ActCategoryDictDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 类别编码
+     */
+	private String categoryCode;
+
+    /**
+     * 活动类别名称；eg：支部建设、联建共建
+     */
+	private String categoryName;
+
+    /**
+     * 等级1,2......
+     */
+	private Integer level;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 上级类别编码
+     */
+	private String parentCode;
+
+    /**
+     * 逻辑删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/EnterGroupSwitchDTO.java → epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentDTO.java

@@ -15,22 +15,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dataaggre.dto.resigroup;
+package com.epmet.resi.group.dto.act;
-
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import lombok.Data;
 
 
 /**
- * 
+ * 活动评论表
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-12-25
+ * @since v1.0.0 2021-04-16
  */
 @Data
-public class EnterGroupSwitchDTO implements Serializable {
+public class ActCommentDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -45,19 +44,19 @@ public class EnterGroupSwitchDTO implements Serializable {
 	private String customerId;
 
     /**
-     * 小组所属网格id
+     * group_act_info.id
      */
-	private String gridId;
+	private String groupActId;
 
     /**
-     * 小组id
+     * 评论人id
      */
-	private String groupId;
+	private String commentUserId;
 
     /**
-     * open开启； close关闭
+     * 评论内容；目前限制500字
      */
-	private String auditSwitch;
+	private String commentContent;
 
     /**
      * 删除标记 0：未删除，1：已删除
@@ -70,12 +69,12 @@ public class EnterGroupSwitchDTO implements Serializable {
 	private Integer revision;
 
     /**
-     * 创建人（customer_user.id）
+     * 创建人，评论人Id，来自user
      */
 	private String createdBy;
 
     /**
-     * 创建时间(邀请时间)
+     * 创建时间
      */
 	private Date createdTime;
 

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActOperationRecordDTO.java

@@ -0,0 +1,99 @@
+/**
+ * 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.resi.group.dto.act;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 活动操作表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+public class ActOperationRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键（签到成功后插入此表）
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * group_act_info.id
+     */
+	private String groupActId;
+
+    /**
+     * 操作人id
+     */
+	private String operateUserId;
+
+    /**
+     * 操作类型：发布：publish;
+取消：cancel；
+变更：change；
+关闭：close
+     */
+	private String operationType;
+
+    /**
+     * 备注；取消理由
+     */
+	private String note;
+
+    /**
+     * 逻辑删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java

@@ -0,0 +1,112 @@
+/**
+ * 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.resi.group.dto.act;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 活动已读记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+public class ActReadRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键(发布活动后后台自动初始化记录)
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 小组所属网格id
+     */
+    private String gridId;
+
+    /**
+     * 小组id
+     */
+    private String groupId;
+
+    /**
+     * group_act_info.id
+     */
+	private String groupActId;
+
+    /**
+     * 活动关闭前已读:read；未读:un_read
+     */
+	private String readFlag;
+
+    /**
+     * 已读:read未读:un_read
+     */
+    private String viewDetail;
+
+    /**
+     * 用户id
+     */
+	private String userId;
+
+    /**
+     * yes：应读；no: 新入群的人已读
+     */
+	private String shouldBeRead;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}