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

5 years ago · 9cbd786d5e
8 changed files with 70 additions and 39 deletions
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.2__add_event.sql
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.2__add_event.sql
@ -0,0 +1,22 @@
+CREATE TABLE `event` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `CLASS_ID` varchar(32) DEFAULT NULL COMMENT '消息网关事件类别ID 从消息网关获取事件类型Id',
+  `APP_ID` varchar(128) DEFAULT NULL COMMENT '消息网关APP_ID',
+  `APP_NAME` varchar(32) DEFAULT NULL COMMENT '消息网关APP_NAME',
+  `EVENT_CODE` varchar(32) DEFAULT NULL COMMENT '事件标识 与消息网关事件tag一致',
+  `EVENT_NAME` varchar(32) DEFAULT NULL COMMENT '事件名称',
+  `EVENT_DESC` varchar(64) DEFAULT NULL COMMENT '事件说明',
+  `FUNCTION_ID` varchar(64) DEFAULT NULL COMMENT '功能ID 来自oper_customize.customer_function表',
+  `IS_COMMON` varchar(1) DEFAULT NULL COMMENT '是否是通用事件 0-否，1-是；消息体内需要体现该字段，通用则说明由业务系统自己计算分值',
+  `DEL_FLAG` varchar(1) DEFAULT NULL COMMENT '删除标识 0-否，1-是',
+  `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁 查询时添加版本号，新加的事件需要更新版本号',
+  `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`),
+  UNIQUE KEY `unx_event_code` (`EVENT_CODE`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='事件表';
+INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', 'epmet_heart', '202007161443499985fa2d397436d10356542134c8f008c48', '党群e事通开发测试', 'register_volunteer', '注册志愿者', '给注册志愿者的人发放积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:19:17', 'APP_USER', '2020-07-23 14:19:17');
+INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', 'epmet_heart', '202007161443499985fa2d397436d10356542134c8f008c48', '党群e事通开发测试', 'active_send_point', '活动发放积分', '给参加活动的人发放积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:16:49', 'APP_USER', '2020-07-23 14:16:49');
+INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3', 'epmet_heart', '202007161443499985fa2d397436d10356542134c8f008c48', '党群e事通开发测试', 'publist_active_live', '发布实况', '给发布实况的人发放积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:16:49', 'APP_USER', '2020-07-23 14:16:49');
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java
@ -18,7 +18,7 @@ public class PointDetailResultDTO implements Serializable {
 	private String ruleDesc;
 	private Integer point;
 	private String pointUnit;
-	private String upLimit;
+	private Integer upLimit;
 	private Boolean enabledFlag;
 	private String upLimitDesc;
 }
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java
@ -205,17 +205,17 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi

            List<String> userIds = dataList.stream().map(data -> data.getUserId()).collect(Collectors.toList());
            Result<List<UserBaseInfoResultDTO>> userInfo =
-                epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
+                    epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
            boolean userRequestCallback = userInfo.success() && null != userInfo.getData() && !userInfo.getData().isEmpty();
            for(int i = NumConstant.ZERO ; i < dataList.size() ; i++){

-                WorkPointVerificationDetailResultDTO o = new WorkPointVerificationDetailResultDTO();
+                WorkPointVerificationDetailResultDTO o = ConvertUtils.sourceToTarget(dataList.get(i),WorkPointVerificationDetailResultDTO.class);
                o.setPoint(new StringBuilder("-").append(dataList.get(i).getPoint().toString()).toString());
-                o.setRemark(dataList.get(i).getRemark());
                if(userRequestCallback) {
                    //如果是陌生人显示微信昵称
                    o.setUserNickname(userInfo.getData().get(i) == null ? ModuleConstant.EMPTY_STR : (StringUtils.isBlank(userInfo.getData().get(i).getShowName()) ? userInfo.getData().get(i).getNickname() : userInfo.getData().get(i).getShowName()));
                }
+
                resultObj.add(o);
            }

--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/epmet_point.sql
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/epmet_point.sql
@ -37,3 +37,7 @@ CREATE TABLE rule_operate_log(
    UPDATED_TIME DATETIME    COMMENT '更新时间' ,
    PRIMARY KEY (ID)
 ) COMMENT = '积分规则操作记录表';
+
+INSERT INTO `epmet_point`.`point_rule`(`ID`, `CUSTOMER_ID`, `RULE_NAME`, `RULE_DESC`, `EVENT_CODE`, `FUNCTION_ID`, `OPERATE_TYPE`, `UP_LIMIT`, `UP_LIMIT_DESC`, `POINT`, `POINT_UNIT`, `ENABLED_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', '3ef7e4bb195eb9e622d68b52509aa940', '注册志愿者', '认证志愿者会获得积分', 'register_volunteer', '43addd0735230c01eedbb38d721076b0', 'plus', 0, '无', 10, 'time', '1', '0', 0, 'APP_USER', '2020-07-23 14:48:56', 'APP_USER', '2020-07-23 14:48:56');
+INSERT INTO `epmet_point`.`point_rule`(`ID`, `CUSTOMER_ID`, `RULE_NAME`, `RULE_DESC`, `EVENT_CODE`, `FUNCTION_ID`, `OPERATE_TYPE`, `UP_LIMIT`, `UP_LIMIT_DESC`, `POINT`, `POINT_UNIT`, `ENABLED_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', '3ef7e4bb195eb9e622d68b52509aa940', '发布实况', '发布实况获得积分', 'publist_active_live', '43addd0735230c01eedbb38d721076b0', 'plus', 0, '无', 10, 'time', '1', '0', 0, 'APP_USER', '2020-07-23 14:48:56', 'APP_USER', '2020-07-23 14:48:56');
+
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
@ -108,17 +108,17 @@ public class UserBaseInfoRedis {
                    gridParam.setGridId(relation.getGridId());
                    baseInfo.setRegisteredGridId(relation.getGridId());
                    Result<BelongGridNameResultDTO> gridResult =
-                        govOrgOpenFeignClient.getGridNameByGridId(gridParam);
+                            govOrgOpenFeignClient.getGridNameByGridId(gridParam);
                    if(gridResult.success() && null != gridResult.getData()
                            && StringUtils.isNotBlank(gridResult.getData().getBelongsGridName())){
                        String gridFullName = gridResult.getData().getBelongsGridName();
                        baseInfo.setRegisteredGridName(gridFullName);
                        StringBuffer buffer = new StringBuffer(gridFullName.split(ModuleConstant.DASH)[NumConstant.ONE]).append(ModuleConstant.DASH).append(baseInfo.getSurname());
-                        switch(baseInfo.getGender()){
-                            case NumConstant.ONE_STR :
+                        switch (baseInfo.getGender()) {
+                            case NumConstant.ONE_STR:
                                buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE);
                                break;
-                            case  NumConstant.TWO_STR :
+                            case NumConstant.TWO_STR:
                                buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_FEMALE);
                                break;
                            default:
@ -126,18 +126,19 @@ public class UserBaseInfoRedis {
                        }
                        baseInfo.setShowName(buffer.toString());
                    }
-                }else{
-                    //如果没有居民注册记录，说明当前用户是陌生人，需要从陌生人网格访问列表中查询所属的客户Id
-                    LatestGridInfoResultDTO gridLatest =
+                }
+            }else{
+                //如果没有居民注册记录，说明当前用户是陌生人，需要从陌生人网格访问列表中查询所属的客户Id
+                LatestGridInfoResultDTO gridLatest =
                        gridLatestDao.selectLatestGridInfoByUserId(userId);
-                    if(null != gridLatest){
-                        baseInfo.setCustomerId(gridLatest.getCustomerId());
-                    }
+                if(null != gridLatest){
+                    baseInfo.setCustomerId(gridLatest.getCustomerId());
                }
-                set(baseInfo);
-                return baseInfo;
            }
+            set(baseInfo);
+            return baseInfo;
        }
+
        return null;
    }
 }
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
@ -197,7 +197,7 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
            if(StringUtils.isNotBlank(info.getUserId())){
                UserBaseInfoResultDTO cache = userBaseInfoRedis.getUserInfo(info.getUserId());
                if(null != cache) {
-                    info.setRegisteredGrid(cache.getRegisteredGridName());
+                    info.setRegisteredGrid(StringUtils.isBlank(cache.getRegisteredGridName()) ? ModuleConstant.EMPTY_STR : cache.getRegisteredGridName());
                }
            }
        });
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml
@ -28,24 +28,28 @@
    <!-- 根据用户id查询user_base_info基本信息  -->
    <select id="selectListByUserIdList" parameterType="java.lang.String" resultType="com.epmet.dto.result.UserBaseInfoResultDTO">
        SELECT
-            ubi.id,
-            ubi.USER_ID,
-            ubi.MOBILE,
-            ubi.SURNAME,
-            ubi.`NAME`,
-            ubi.real_name,
-            ubi.ID_NUM,
-            ubi.GENDER,
-            ubi.STREET,
-            ubi.DISTRICT,
-            ubi.BUILDING_ADDRESS,
-            ubi.NICKNAME,
-            ubi.HEAD_IMG_URL
-        FROM
-            user_base_info ubi
-        WHERE
-            ubi.DEL_FLAG = '0'
-            AND ubi.USER_ID = #{userId}
+        ubi.id,
+        wechat.USER_ID,
+        ubi.MOBILE,
+        ubi.SURNAME,
+        ubi.`NAME`,
+        ubi.real_name,
+        ubi.ID_NUM,
+        ubi.GENDER,
+        ubi.STREET,
+        ubi.DISTRICT,
+        ubi.BUILDING_ADDRESS,
+        wechat.NICKNAME,
+        wechat.HEAD_IMG_URL
+    FROM
+        user_wechat wechat
+        LEFT JOIN user_base_info ubi ON wechat.USER_ID = ubi.USER_ID
+        AND wechat.DEL_FLAG = '0'
+        AND ubi.DEL_FLAG = '0'
+        AND ubi.USER_ID = #{userId}
+    WHERE
+        wechat.USER_ID = #{userId}
+
    </select>

    <!-- 根据用户id获取user_wechat表微信用户基本信息   -->
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
@ -93,10 +93,10 @@
    <!-- 查询人员信息，排序，包括陌生人与注册居民，没有注册居民则只有微信昵称 -->
    <select id="selectResiAndStrangerInfo" resultType="com.epmet.dto.result.CustomerUser4PointResultDTO">
        SELECT
-            wechat.USER_ID,
-            wechat.NICKNAME AS userNickname,
-            wechat.HEAD_IMG_URL AS userHeadPhoto,
-            base.REAL_NAME AS userName
+        wechat.USER_ID,
+        IFNULL(wechat.NICKNAME,'') AS userNickname,
+        IFNULL(wechat.HEAD_IMG_URL,'') AS userHeadPhoto,
+        IFNULL(base.REAL_NAME,'') AS userName
        FROM
            user_wechat wechat
        LEFT JOIN