diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index 9cbb4e0e90..69c804c58d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -136,11 +136,10 @@ public class UserBadgeServiceImpl implements UserBadgeService { Map> collect = userOperListResultDTOS.stream().collect(Collectors.groupingBy(UserOperListResultDTO::getIsLighted)); List result = collect.get(BadgeConstant.YES); List noLight = collect.get(BadgeConstant.NO); - if (CollectionUtils.isEmpty(noLight)){ - return result; - } - result.addAll(noLight.stream().sorted(Comparator.comparing(UserOperListResultDTO::getSort)).collect(Collectors.toList())); - return result; + List resultFin = new ArrayList<>(); + resultFin.addAll(CollectionUtils.isEmpty(result)?new ArrayList<>():result); + resultFin.addAll(CollectionUtils.isEmpty(noLight)?new ArrayList<>():noLight.stream().sorted(Comparator.comparing(UserOperListResultDTO::getSort)).collect(Collectors.toList())); + return resultFin; } /** diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/2020-11-03_badege.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/2020-11-03_badege.sql deleted file mode 100644 index 0e605aa9ab..0000000000 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/2020-11-03_badege.sql +++ /dev/null @@ -1,199 +0,0 @@ -/* - Navicat Premium Data Transfer - - Source Server : 亿联开发 - Source Server Type : MySQL - Source Server Version : 50728 - Source Host : 192.168.1.130:3306 - Source Schema : epmet_user - - Target Server Type : MySQL - Target Server Version : 50728 - File Encoding : 65001 - - Date: 03/11/2020 10:36:00 -*/ - -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - --- ---------------------------- --- Table structure for badege --- ---------------------------- -DROP TABLE IF EXISTS `badege`; -CREATE TABLE `badege` -( - `ID` varchar(64) NOT NULL COMMENT '主键ID', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id 默认配置id：default', - `BADEGE_NAME` varchar(32) NOT NULL COMMENT '徽章名称', - `BADEGE_ICON` varchar(256) NOT NULL COMMENT '徽章图标url', - `FIXATION_BADEGE_TYPE` varchar(32) NOT NULL DEFAULT 'none' COMMENT '固有徽章类型 前端页面跳转标识，党员徽章：party;无：none', - `BADEGE_STATUS` varchar(16) NOT NULL COMMENT '状态 上线:online;下线:offline;', - `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除', - `REVISION` int(11) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`, `CUSTOMER_ID`) USING BTREE -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='徽章'; - --- ---------------------------- --- Records of badege --- ---------------------------- -BEGIN; -INSERT INTO `badege` -VALUES ('1', 'default', '党员徽章', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20200909/e4935b1f790b4d4e91ac9190a47120bb.jpg', - 'party', 'online', '0', 0, 'APP_USER', '2020-11-03 10:33:52', 'APP_USER', '2020-11-03 10:34:00'); -INSERT INTO `badege` -VALUES ('2', 'default', '人大代表徽章', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20200909/e4935b1f790b4d4e91ac9190a47120bb.jpg', - 'none', 'online', '0', 0, 'APP_USER', '2020-11-03 10:33:52', 'APP_USER', '2020-11-03 10:34:00'); -INSERT INTO `badege` -VALUES ('3', 'default', '政协委员徽章', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20200909/e4935b1f790b4d4e91ac9190a47120bb.jpg', - 'none', 'online', '0', 0, 'APP_USER', '2020-11-03 10:33:52', 'APP_USER', '2020-11-03 10:34:00'); -COMMIT; - --- ---------------------------- --- Table structure for badege_certification_config --- ---------------------------- -DROP TABLE IF EXISTS `badege_certification_config`; -CREATE TABLE `badege_certification_config` -( - `ID` varchar(64) NOT NULL COMMENT '主键ID', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id 默认配置id：default', - `BADEGE_ID` varchar(64) NOT NULL COMMENT '徽章ID', - `CERTIFICATION_TYPE` varchar(16) NOT NULL COMMENT '认证信息类型 手机号:mobile；全名:fullname;身份证:idcard;认证证件: certificate;认证说明(备注):remark', - `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除', - `REVISION` int(11) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='徽章认证配置'; - --- ---------------------------- --- Records of badege_certification_config --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for badege_certification_config_field --- ---------------------------- -DROP TABLE IF EXISTS `badege_certification_config_field`; -CREATE TABLE `badege_certification_config_field` -( - `ID` varchar(64) NOT NULL, - `CN_NAME` varchar(64) NOT NULL COMMENT '中文名', - `EN_NAME` varchar(64) NOT NULL COMMENT '英文名(字段名)', - `FIELD_TYPE` varchar(32) NOT NULL COMMENT '字段类型 img：图片，text：文本', - `IS_REQUIRED` tinyint(1) NOT NULL COMMENT '是否必填', - `CERTIFICATION_TYPE` varchar(255) NOT NULL COMMENT '认证信息类型', - `SORT` int(10) NOT NULL COMMENT '字段排序', - `DEL_FLAG` int(11) DEFAULT NULL COMMENT '删除标识 1删除0未删除', - `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`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT =' 徽章认证配置字段表\n'; - --- ---------------------------- --- Records of badege_certification_config_field --- ---------------------------- -BEGIN; -INSERT INTO `badege_certification_config_field` -VALUES ('a5be5d931cf411eb8dcfc03fd56f7847', '手机号', 'mobile', 'text', 1, 'mobile', 3, 0, 0, 'APP_USER', - '2020-11-02 18:14:02', 'APP_USER', '2020-11-02 18:14:06'); -INSERT INTO `badege_certification_config_field` -VALUES ('a5c01dd81cf411eb8dcfc03fd56f7847', '姓', 'subName', 'text', 1, 'fullName', 0, 0, 0, 'APP_USER', - '2020-11-02 18:14:02', 'APP_USER', '2020-11-02 18:14:06'); -INSERT INTO `badege_certification_config_field` -VALUES ('a5c01de81cf411eb8dcfc03fd56f7847', '名', 'name', 'text', 1, 'fullName', 1, 0, 0, 'APP_USER', - '2020-11-02 18:14:02', 'APP_USER', '2020-11-02 18:14:06'); -INSERT INTO `badege_certification_config_field` -VALUES ('a5c22e511cf411eb8dcfc03fd56f7847', '身份证', 'idcard', 'text', 1, 'idcard', 2, 0, 0, 'APP_USER', - '2020-11-02 18:14:02', 'APP_USER', '2020-11-02 18:14:06'); -INSERT INTO `badege_certification_config_field` -VALUES ('a5c4c2c11cf411eb8dcfc03fd56f7847', '认证证件', 'certificate', 'img', 1, 'certificate', 4, 0, 0, 'APP_USER', - '2020-11-02 18:14:02', 'APP_USER', '2020-11-02 18:14:06'); -INSERT INTO `badege_certification_config_field` -VALUES ('a5c608301cf411eb8dcfc03fd56f7847', '认证说明(备注)', 'remark', 'text', 1, 'remark', 5, 0, 0, 'APP_USER', - '2020-11-02 18:14:02', 'APP_USER', '2020-11-02 18:14:06'); -COMMIT; - --- ---------------------------- --- Table structure for resi_user_badege --- ---------------------------- -DROP TABLE IF EXISTS `resi_user_badege`; -CREATE TABLE `resi_user_badege` -( - `ID` varchar(64) NOT NULL COMMENT '主键ID', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id 默认配置id：default', - `GRID_ID` varchar(64) NOT NULL COMMENT '用户注册网格ID', - `USER_ID` varchar(64) NOT NULL COMMENT '用户ID', - `BADEGE_ID` varchar(64) NOT NULL COMMENT '徽章ID', - `IS_OPENED` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否开启(点亮) 1:点亮；0:未点亮', - `CERTIFICATION_AUTID_STATUS` varchar(16) NOT NULL DEFAULT 'auditing' COMMENT '认证(审核)状态 待审核:auditing;审核通过:pass;驳回:rejected;', - `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除', - `REVISION` int(11) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='用户徽章关系表'; - --- ---------------------------- --- Records of resi_user_badege --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for user_badege_certificate_record --- ---------------------------- -DROP TABLE IF EXISTS `user_badege_certificate_record`; -CREATE TABLE `user_badege_certificate_record` -( - `ID` varchar(64) NOT NULL COMMENT '主键ID', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id ', - `GRID_ID` varchar(64) NOT NULL COMMENT '用户注册网格ID', - `USER_ID` varchar(64) NOT NULL COMMENT '用户ID', - `BADEGE_ID` varchar(64) NOT NULL COMMENT '徽章ID', - `SURNAME` varchar(8) DEFAULT NULL COMMENT '姓', - `NAME` varchar(16) DEFAULT NULL COMMENT '名', - `ID_NUM` varchar(32) DEFAULT NULL COMMENT '身份证号 网格内去重', - `CERTIFICATION_IMG` varchar(512) DEFAULT NULL COMMENT '认证证件图片', - `REMAEK` varchar(128) DEFAULT NULL COMMENT '认证说明(备注)', - `AUDIT_STATUS` varchar(32) NOT NULL DEFAULT 'auditing' COMMENT '审核状态 approved:审核通过，rejected:审核驳回;auditing:审核中', - `AUDIT_REMARK` varchar(128) DEFAULT NULL COMMENT '审核意见', - `STAFF_ID` varchar(32) DEFAULT NULL COMMENT '审核人 审核人Id', - `AUDIT_TIME` datetime DEFAULT NULL COMMENT '审核时间', - `DEL_FLAG` varchar(32) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除', - `REVISION` int(11) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`), - KEY `IDX_USER_ID` (`USER_ID`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='用户认证徽章记录表'; - --- ---------------------------- --- Records of user_badege_certificate_record --- ---------------------------- -BEGIN; -COMMIT; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.10__add_badege.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.10__add_badege.sql new file mode 100644 index 0000000000..cf41c765d1 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.10__add_badege.sql @@ -0,0 +1,219 @@ +/* + Navicat Premium Data Transfer + + Source Server : 亿联开发 + Source Server Type : MySQL + Source Server Version : 50728 + Source Host : 192.168.1.130:3306 + Source Schema : epmet_user + + Target Server Type : MySQL + Target Server Version : 50728 + File Encoding : 65001 + + Date: 19/11/2020 11:19:00 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for badge +-- ---------------------------- +DROP TABLE IF EXISTS `badge`; +CREATE TABLE `badge` +( + `ID` varchar(64) NOT NULL COMMENT '主键ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id 默认配置id：default', + `BADGE_NAME` varchar(32) NOT NULL COMMENT '徽章名称', + `BADGE_ICON` varchar(256) NOT NULL COMMENT '徽章图标url', + `FIXATION_BADGE_TYPE` varchar(32) NOT NULL DEFAULT 'none' COMMENT '固有徽章类型 前端页面跳转标识，党员徽章：party;无：none', + `SORT` int(11) NOT NULL COMMENT '徽章排序', + `BADGE_STATUS` varchar(16) NOT NULL COMMENT '状态 上线:online;下线:offline;', + `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`, `CUSTOMER_ID`) USING BTREE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='徽章'; + +-- ---------------------------- +-- Records of badge +-- ---------------------------- +BEGIN; +INSERT INTO `badge` +VALUES ('1', 'default', '党员徽章', + 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20201117/57d817af26e74af2928d7a0dcd53fa69.png', + 'party', 2, 'online', '0', 0, 'APP_USER', '2020-11-03 10:33:52', 'APP_USER', '2020-11-03 10:34:00'); +INSERT INTO `badge` +VALUES ('2', 'default', '人大代表徽章', + 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20201117/eae64f4039d340f7b83d17c662f29fba.png', + 'none', 1, 'online', '0', 0, 'APP_USER', '2020-11-03 10:33:53', 'APP_USER', '2020-11-03 10:34:00'); +INSERT INTO `badge` +VALUES ('3', 'default', '政协委员徽章', + 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20201117/5a1d29eabe014d6fb3d8a19a4bd1cc35.png', + 'none', 0, 'online', '0', 0, 'APP_USER', '2020-11-03 10:33:54', 'APP_USER', '2020-11-03 10:34:00'); +COMMIT; + +-- ---------------------------- +-- Table structure for badge_certification_config +-- ---------------------------- +DROP TABLE IF EXISTS `badge_certification_config`; +CREATE TABLE `badge_certification_config` +( + `ID` varchar(64) NOT NULL COMMENT '主键ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id 默认配置id：default', + `BADGE_ID` varchar(64) NOT NULL COMMENT '徽章ID', + `CERTIFICATION_TYPE` varchar(16) NOT NULL COMMENT '认证信息类型 手机号:mobile；全名:fullname;身份证:idcard;认证证件: certificate;认证说明(备注):remark', + `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='徽章认证配置'; + +-- ---------------------------- +-- Records of badge_certification_config +-- ---------------------------- +BEGIN; +INSERT INTO `badge_certification_config` +VALUES ('1001', 'default', '1', 'fullname', '0', 0, '1', '2020-11-04 16:46:43', '1', '2020-11-04 16:46:47'); +INSERT INTO `badge_certification_config` +VALUES ('1002', 'default', '1', 'idcard', '0', 0, '1', '2020-11-04 16:46:43', '1', '2020-11-04 16:46:47'); +INSERT INTO `badge_certification_config` +VALUES ('1003', 'default', '1', 'mobile', '0', 0, '1', '2020-11-04 16:46:43', '1', '2020-11-04 16:46:47'); +INSERT INTO `badge_certification_config` +VALUES ('1004', 'default', '1', 'remark', '0', 0, '1', '2020-11-04 16:46:43', '1', '2020-11-04 16:46:47'); +INSERT INTO `badge_certification_config` +VALUES ('2001', 'default', '2', 'fullname', '0', 0, '1', '2020-11-04 16:46:43', '1', '2020-11-04 16:46:47'); +INSERT INTO `badge_certification_config` +VALUES ('2002', 'default', '2', 'idcard', '0', 0, '1', '2020-11-04 16:46:43', '1', '2020-11-04 16:46:47'); +INSERT INTO `badge_certification_config` +VALUES ('2003', 'default', '2', 'mobile', '0', 0, '1', '2020-11-04 16:46:43', '1', '2020-11-04 16:46:47'); +INSERT INTO `badge_certification_config` +VALUES ('2004', 'default', '2', 'certificate', '0', 0, '1', '2020-11-04 16:46:43', '1', '2020-11-04 16:46:47'); +INSERT INTO `badge_certification_config` +VALUES ('2005', 'default', '2', 'remark', '0', 0, '1', '2020-11-04 16:46:43', '1', '2020-11-04 16:46:47'); +INSERT INTO `badge_certification_config` +VALUES ('3001', 'default', '3', 'fullname', '0', 0, '1', '2020-11-04 16:46:43', '1', '2020-11-04 16:46:47'); +INSERT INTO `badge_certification_config` +VALUES ('3002', 'default', '3', 'idcard', '0', 0, '1', '2020-11-04 16:46:43', '1', '2020-11-04 16:46:47'); +INSERT INTO `badge_certification_config` +VALUES ('3003', 'default', '3', 'mobile', '0', 0, '1', '2020-11-04 16:46:43', '1', '2020-11-04 16:46:47'); +INSERT INTO `badge_certification_config` +VALUES ('3004', 'default', '3', 'certificate', '0', 0, '1', '2020-11-04 16:46:43', '1', '2020-11-04 16:46:47'); +INSERT INTO `badge_certification_config` +VALUES ('3005', 'default', '3', 'remark', '0', 0, '1', '2020-11-04 16:46:43', '1', '2020-11-04 16:46:47'); +COMMIT; + +-- ---------------------------- +-- Table structure for badge_certification_config_field +-- ---------------------------- +DROP TABLE IF EXISTS `badge_certification_config_field`; +CREATE TABLE `badge_certification_config_field` +( + `ID` varchar(64) NOT NULL, + `CN_NAME` varchar(64) NOT NULL COMMENT '中文名', + `EN_NAME` varchar(64) NOT NULL COMMENT '英文名(字段名)', + `FIELD_TYPE` varchar(32) NOT NULL COMMENT '字段类型 img：图片，text：文本', + `IS_REQUIRED` tinyint(1) NOT NULL COMMENT '是否必填', + `CERTIFICATION_TYPE` varchar(16) NOT NULL COMMENT '认证信息类型 手机号:mobile；全名:fullname;身份证:idcard;认证证件: certificate;认证说明(备注):remark', + `SORT` int(10) NOT NULL COMMENT '字段排序', + `DEL_FLAG` int(1) DEFAULT NULL COMMENT '删除标识 1删除0未删除', + `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`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT =' 徽章认证配置字段表\n'; + +-- ---------------------------- +-- Records of badge_certification_config_field +-- ---------------------------- +BEGIN; +INSERT INTO `badge_certification_config_field` +VALUES ('a5be5d931cf411eb8dcfc03fd56f7847', '手机号', 'mobile', 'text', 1, 'mobile', 3, 0, 0, 'APP_USER', + '2020-11-02 18:14:02', 'APP_USER', '2020-11-02 18:14:06'); +INSERT INTO `badge_certification_config_field` +VALUES ('a5c01dd81cf411eb8dcfc03fd56f7847', '姓', 'surname', 'text', 1, 'fullName', 0, 0, 0, 'APP_USER', + '2020-11-02 18:14:02', 'APP_USER', '2020-11-02 18:14:06'); +INSERT INTO `badge_certification_config_field` +VALUES ('a5c01de81cf411eb8dcfc03fd56f7847', '名', 'name', 'text', 1, 'fullName', 1, 0, 0, 'APP_USER', + '2020-11-02 18:14:02', 'APP_USER', '2020-11-02 18:14:06'); +INSERT INTO `badge_certification_config_field` +VALUES ('a5c22e511cf411eb8dcfc03fd56f7847', '身份证', 'idcard', 'text', 1, 'idcard', 2, 0, 0, 'APP_USER', + '2020-11-02 18:14:02', 'APP_USER', '2020-11-02 18:14:06'); +INSERT INTO `badge_certification_config_field` +VALUES ('a5c4c2c11cf411eb8dcfc03fd56f7847', '认证证件', 'certificationImg', 'img', 1, 'certificate', 4, 0, 0, 'APP_USER', + '2020-11-02 18:14:02', 'APP_USER', '2020-11-02 18:14:06'); +INSERT INTO `badge_certification_config_field` +VALUES ('a5c608301cf411eb8dcfc03fd56f7847', '备注', 'remark', 'text', 1, 'remark', 5, 0, 0, 'APP_USER', + '2020-11-02 18:14:02', 'APP_USER', '2020-11-02 18:14:06'); +COMMIT; + +-- ---------------------------- +-- Table structure for resi_user_badge +-- ---------------------------- +DROP TABLE IF EXISTS `resi_user_badge`; +CREATE TABLE `resi_user_badge` +( + `ID` varchar(64) NOT NULL COMMENT '主键ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id 默认配置id：default', + `GRID_ID` varchar(64) NOT NULL COMMENT '用户注册网格ID', + `USER_ID` varchar(64) NOT NULL COMMENT '用户ID', + `BADGE_ID` varchar(64) NOT NULL COMMENT '徽章ID', + `IS_OPENED` tinyint(1) NOT NULL COMMENT '是否开启(点亮) 1:点亮；0:未点亮', + `CERTIFICATION_AUTID_STATUS` varchar(16) NOT NULL DEFAULT 'auditing' COMMENT '认证(审核)状态 待审核:auditing;审核通过: approved;驳回:rejected;', + `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='用户徽章关系表'; + + +-- ---------------------------- +-- Table structure for user_badge_certificate_record +-- ---------------------------- +DROP TABLE IF EXISTS `user_badge_certificate_record`; +CREATE TABLE `user_badge_certificate_record` +( + `ID` varchar(64) NOT NULL COMMENT '主键ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id ', + `GRID_ID` varchar(64) NOT NULL COMMENT '用户注册网格ID', + `USER_ID` varchar(64) NOT NULL COMMENT '用户ID', + `BADGE_ID` varchar(64) NOT NULL COMMENT '徽章ID', + `SURNAME` varchar(8) DEFAULT NULL COMMENT '姓', + `NAME` varchar(16) DEFAULT NULL COMMENT '名', + `MOBILE` varchar(64) DEFAULT NULL COMMENT '手机号', + `ID_NUM` varchar(32) DEFAULT NULL COMMENT '身份证号 网格内去重', + `CERTIFICATION_IMG` varchar(512) DEFAULT NULL COMMENT '认证证件图片', + `REMAEK` varchar(256) DEFAULT NULL COMMENT '认证说明(备注)', + `AUDIT_STATUS` varchar(32) NOT NULL DEFAULT 'auditing' COMMENT '审核状态 approved:审核通过，rejected:审核驳回;auditing:审核中', + `AUDIT_REMARK` varchar(256) DEFAULT NULL COMMENT '审核意见', + `STAFF_ID` varchar(32) DEFAULT NULL COMMENT '审核人 审核人Id', + `AUDIT_TIME` datetime DEFAULT NULL COMMENT '审核时间', + `IS_LAST` varchar(8) NOT NULL COMMENT '是否是最新纪录：yes：最新纪录，no：非最新纪录', + `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`), + KEY `IDX_USER_ID` (`USER_ID`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='用户认证徽章记录表'; + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml index c1f8791e16..a46001c8c6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml @@ -40,7 +40,7 @@ LEFT JOIN USER_RESI_INFO resi ON user.ID = resi.USER_ID AND resi.DEL_FLAG = '0' LEFT JOIN - USER_WECHAT wechat ON user.ID = wechat.USER_ID AND wechat.DEL_FLAG = '0' + user_base_info wechat ON user.ID = wechat.USER_ID AND wechat.DEL_FLAG = '0' LEFT JOIN REGISTER_RELATION relation ON user.ID = relation.USER_ID AND relation.DEL_FLAG = '0' diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml index 5797e95eef..d51c98cf19 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml @@ -70,7 +70,7 @@ user_id AS userId, IFNULL(head_img_url,'') AS userHeadPhoto FROM - user_wechat + user_base_info WHERE user_id in @@ -96,7 +96,7 @@ SELECT wechat.USER_ID, IFNULL(wechat.NICKNAME,'') AS userNickname, - IFNULL(wechat.HEAD_IMG_URL,'') AS userHeadPhoto, + IFNULL(base.HEAD_IMG_URL,'') AS userHeadPhoto, IFNULL(base.REAL_NAME,'') AS userName FROM user_wechat wechat