diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index 5a261b93bf..de2af9b1f1 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -95,6 +95,10 @@ public enum EpmetErrorCode {
 	SIGN_IN_TIME_NO(8513, "签到时间还未到~"),
     SIGN_IN_TIME_END(8514, "签到时间已结束~"),
 
+	//徽章管理
+	DUPLICATE_BADGE_NAME(8515, "徽章名已存在"),
+	DUPLICATE_PARTY_BADGE_NAME(8516, "不可删除党员徽章"),
+
     // 该错误不会提示给前端，只是后端传输错误信息用。
     ACCESS_SQL_FILTER_MISSION_ARGS(8701, "缺少生成权限过滤SQL所需参数"),
     OPER_ADD_CUSTOMER_ROOT_AGENCY_ERROR(8702, "添加客户根级组织失败"),
@@ -110,6 +114,8 @@ public enum EpmetErrorCode {
 	OPER_CUSTOMER_FOOTBAR_EXISTS(8712, "footbar已存在"),
 	OPER_CUSTOMER_FOOTBAR_NOT_FOUND(8713, "footbar不存在"),
     OPER_EXT_APP_SECRET_RESET_FAIL(8714, "秘钥更新失败"),
+	OPER_UPLOAD_IMG_TYPE_ERROR(8715, "请上传PNG格式的图片"),
+	OPER_UPLOAD_IMG_SIZE_ERROR(8716, "请上传200*200的图片"),
 
 	// 党建声音 前端提示 88段
 	DRAFT_CONTENT_IS_NULL(8801, "至少需要添加一个段落"),
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
index 27a081dacc..19d8e73374 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
@@ -9,16 +9,23 @@
 package com.epmet.commons.tools.redis;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import org.apache.poi.ss.formula.functions.T;
+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.*;
 import org.springframework.data.redis.support.atomic.RedisAtomicLong;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * Redis工具类
@@ -171,10 +178,40 @@ public class RedisUtils {
         }
     }
 
-    public Object lindex(String key,Long index){
-        return redisTemplate.opsForList().index(key,index);
+    public Object lindex(String key,Long index){ return redisTemplate.opsForList().index(key,index);
     }
 
+    public <T> List<T> lrange(String key,long start,long end,Class<T> clazz){
+        List<Object> content =  redisTemplate.opsForList().range(key,start,end);
+        if(CollectionUtils.isEmpty(content)) return null;
+         return content.stream().map( o -> {
+                try {
+                    T target = clazz.newInstance();
+                    BeanUtils.copyProperties(o, target);
+                    return target;
+                }catch (Exception e){throw new RenException("convert error");}
+            }).collect(Collectors.toList());
+    }
+
+    /**
+     * @Description Redis lrem :
+     *                      根据参数 count 的值，移除列表中与参数 value 相等的元素
+     * COUNT 的值可以是以下几种 ：
+     *                      count > 0 : 从表头开始向表尾搜索，移除与 value 相等的元素，数量为 count
+     *                      count < 0 : 从表尾开始向表头搜索，移除与 value 相等的元素，数量为 count 的绝对值
+     *                      count = 0 : 移除表中所有与 value 相等的值
+     * 返回值 :
+     *          被移除元素的数量
+     *          列表不存在时返回 0
+     * @param key
+     * @param count
+     * @param o 这里的Object需要重写equals(FIXME 注意序列化)
+     * @return long
+     * @author wangc
+     * @date 2020.11.05 10:22
+    */
+    public long lrem(String key,long count,Object o){ return redisTemplate.opsForList().remove(key,count,o);}
+
     public Object rightPop(String key) {
         return redisTemplate.opsForList().rightPop(key);
     }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/fact/FactIndexController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/fact/FactIndexController.java
index 2fe90dbce7..3a2f5cfebb 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/fact/FactIndexController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/fact/FactIndexController.java
@@ -63,6 +63,7 @@ public class FactIndexController {
      * @Description 按月查询各项指标数据
      * @author sun
      */
+
     @PostMapping("index/ablitylist")
     public Result<List<AblityListResultDTO>> ablityList(@RequestBody AblityListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AblityListFormDTO.AddUserInternalGroup.class);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
index f099678400..b2e0b7a9da 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
@@ -173,6 +173,13 @@
             <appender-ref ref="WARN_FILE"/>
             <appender-ref ref="ERROR_FILE"/>
         </root>
+        <!-- 屏蔽logger -->
+        <logger name="org.springframework" level="INFO"/>
+        <logger name="org.apache" level="WARN"/>
+        <logger name="org.mybatis.spring" level="WARN"/>
+        <logger name="io.netty" level="WARN"/>
+        <logger name="org.redisson.connection" level="WARN"/>
+        <logger name="org.hibernate.validator" level="WARN"/>
     </springProfile>
 
 </configuration>
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
index 65cf6b2d2d..3f56b6f8c5 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
@@ -10,6 +10,7 @@ package com.epmet.controller;
 
 import com.epmet.cloud.CloudStorageConfig;
 import com.epmet.cloud.OssFactory;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -42,6 +43,9 @@ import springfox.documentation.annotations.ApiIgnore;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Map;
 
@@ -223,6 +227,36 @@ public class OssController {
 		return ossService.uploadImg(file);
 	}
 
+
+	@PostMapping("uploadimg/badgeicon")
+	public Result<UploadImgResultDTO> badgeIcon(@RequestParam("file") MultipartFile file) throws IOException {
+
+		// 校验文件类型
+		if (!MediaType.IMAGE_PNG_VALUE.equals(file.getContentType())) {
+			log.error("uploadArticleImg file type:{} is not support 2 upload", file.getContentType());
+			throw new RenException(EpmetErrorCode.OPER_UPLOAD_IMG_TYPE_ERROR.getCode()
+					, EpmetErrorCode.OPER_UPLOAD_IMG_TYPE_ERROR.getMsg());
+		}
+
+		// 校验文件体积,不超过2m
+		long maxSize = 2 * 1024 * 1024;
+		long size = file.getSize();
+		if (size > maxSize) {
+			throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode()
+					, EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg());
+		}
+
+		BufferedImage bufferedImage = ImageIO.read(file.getInputStream());
+		int width = bufferedImage.getWidth();
+		int height = bufferedImage.getHeight();
+		if (width != 200 || height != 200) {
+			throw new RenException(EpmetErrorCode.OPER_UPLOAD_IMG_SIZE_ERROR.getCode()
+					, EpmetErrorCode.OPER_UPLOAD_IMG_SIZE_ERROR.getMsg());
+
+		}
+		return ossService.uploadImg(file);
+	}
+
 	/**
 	 * @param byteFile  fileName
 	 * @Description 外挂-文件上传
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyElementTreeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyElementTreeResultDTO.java
new file mode 100644
index 0000000000..90ee4f6f29
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyElementTreeResultDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @description:
+ * @author: liushaowen
+ * @date: 2020/11/6 13:54
+ */
+@Data
+public class AgencyElementTreeResultDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Set<String> defaultKeys;
+
+    private List<Agency> list;
+
+    @Data
+    public static class Agency{
+        private String id;
+
+        private String label;
+
+        @JsonInclude(JsonInclude.Include.NON_EMPTY)
+        private List<AgencyElementTreeResultDTO.Agency> children;
+    }
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
index 80acd68b46..eaa58b167f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+import com.baomidou.mybatisplus.extension.api.R;
 import com.epmet.commons.tools.annotation.LoginUser;
+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.ExcelUtils;
@@ -32,12 +34,16 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.excel.CustomerAgencyExcel;
 import com.epmet.service.CustomerAgencyService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 
 /**
@@ -260,4 +266,33 @@ public class CustomerAgencyController {
     Result<OrganizeTreeResultDTO> organizeTree(@PathVariable("agencyId") String agencyId) {
         return new Result<OrganizeTreeResultDTO>().ok(customerAgencyService.organizeTree(agencyId));
     }
+
+    /**
+     * @Description 对外接口，根据customerId返回Element UI中Tree结构的agency列表
+     * @param customerId
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author liushaowen
+     * @Date 2020/11/6 13:51
+     */
+    @PostMapping("getagencyelementtreelist")
+    public Result<List<AgencyElementTreeResultDTO.Agency>> getAgencyElementTreeList(String customerId){
+        if (StringUtils.isBlank(customerId)){
+            throw new RenException("customerId不能为空");
+        }
+        return new Result<List<AgencyElementTreeResultDTO.Agency>>().ok(customerAgencyService.getAgencyElementTree(customerId).getList());
+    }
+    /**
+     * @Description 对外接口，根据customerId返回Element UI中Tree结构的agency keys
+     * @param customerId
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author liushaowen
+     * @Date 2020/11/6 13:51
+     */
+    @PostMapping("getagencyelementtreekeys")
+    public Result<Set<String>> getAgencyElementTreeKeys(String customerId){
+        if (StringUtils.isBlank(customerId)){
+            throw new RenException("customerId不能为空");
+        }
+        return new Result<Set<String>>().ok(customerAgencyService.getAgencyElementTree(customerId).getDefaultKeys());
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index 1c6f42456c..cdf8e10110 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -196,4 +196,14 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @author sun
      **/
     List<OrganizeTreeResultDTO> selectAllSub(@Param("agencyId") String agencyId);
+
+    /**
+     * @Description 返回elementTree结构的agency树
+     * @param customerId
+     * @param pid
+     * @return java.util.List<com.epmet.dto.result.AgencyElementTreeResultDTO.Agency>
+     * @Author liushaowen
+     * @Date 2020/11/6 14:57
+     */
+    List<AgencyElementTreeResultDTO.Agency> getAgencyElementTree(@Param("customerId") String customerId,@Param("pid") String pid);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
index 9297e8f5f1..70954d2d72 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
@@ -225,4 +225,13 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @author sun
      **/
     OrganizeTreeResultDTO organizeTree(String agencyId);
+
+    /**
+     * @Description 运营端-返回element ui - tree 结构agency列表
+     * @param customerId
+     * @return com.epmet.dto.result.AgencyElementTreeResultDTO
+     * @Author liushaowen
+     * @Date 2020/11/6 14:02
+     */
+    AgencyElementTreeResultDTO getAgencyElementTree(String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index dd3360a781..6b46f62d78 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -1030,4 +1030,31 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return baseDao.selectorganizeTree(agencyId);
     }
 
+    /**
+     * @param customerId
+     * @return com.epmet.dto.result.AgencyElementTreeResultDTO
+     * @Description 运营端-返回element ui - tree 结构agency列表
+     * @Author liushaowen
+     * @Date 2020/11/6 14:02
+     */
+    @Override
+    public AgencyElementTreeResultDTO getAgencyElementTree(String customerId) {
+        List<AgencyElementTreeResultDTO.Agency> agencyList = baseDao.getAgencyElementTree(customerId, "0");
+        Set<String> defaultKeys = new HashSet<>();
+        traversalAgencyList(agencyList,0,defaultKeys);
+        AgencyElementTreeResultDTO dto = new AgencyElementTreeResultDTO();
+        dto.setList(agencyList);
+        dto.setDefaultKeys(defaultKeys);
+        return dto;
+    }
+    private void traversalAgencyList(List<AgencyElementTreeResultDTO.Agency> agencyList,int times,Set<String> set){
+        if (agencyList.size() > 0 && times < 2){
+            for (AgencyElementTreeResultDTO.Agency list : agencyList) {
+                set.add(list.getId());
+                times++;
+                traversalAgencyList(list.getChildren(),times,set);
+            }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 300f559468..b85f892aa1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -373,4 +373,12 @@
     </select>
     <!-- sql递归 查询组织、组织下部门、组织下网格基本信息及递归查询下级信息 end-->
 
+    <resultMap id="elementTreeAgency" type="com.epmet.dto.result.AgencyElementTreeResultDTO$Agency">
+        <id column="ID" property="id"></id>
+        <result column="ORGANIZATION_NAME" property="label"></result>
+        <collection property="children" select="getAgencyElementTree" column="{pid=id,customerId=customer_id}"></collection>
+    </resultMap>
+    <select id="getAgencyElementTree" resultMap="elementTreeAgency">
+        select id,organization_name,customer_id from customer_agency where pid = #{pid} and customer_id = #{customerId}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/BadgeListFormDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/BadgeListFormDTO.java
new file mode 100644
index 0000000000..c5ace2985f
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/BadgeListFormDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.resi.mine.dto.from;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 11:07 上午
+ */
+@Data
+public class BadgeListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 9082922684993474574L;
+
+    public interface BadgeList{}
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 客户ID
+     */
+    @NotBlank(message = "客户ID不能为空",groups = {BadgeList.class})
+    private String customerId;
+}
diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/MyAdviceListFormDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/MyAdviceListFormDTO.java
new file mode 100644
index 0000000000..b8cf057c5c
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/MyAdviceListFormDTO.java
@@ -0,0 +1,10 @@
+package com.epmet.resi.mine.dto.from;
+
+/**
+ * @description: 我的建议列表DTO
+ * @author: liushaowen
+ * @date: 2020/11/5 10:38
+ */
+
+public class MyAdviceListFormDTO {
+}
diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/OperListFormDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/OperListFormDTO.java
new file mode 100644
index 0000000000..a0f7b7f919
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/OperListFormDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.resi.mine.dto.from;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 4:18 下午
+ */
+@Data
+public class OperListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -1872129597916414752L;
+
+    public interface OperList{}
+
+    @NotBlank(message = "客户ID不能为空",groups = {OperList.class})
+    private String customerId;
+}
diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/SubmitAdviceFormDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/SubmitAdviceFormDTO.java
new file mode 100644
index 0000000000..8ea37f2603
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/SubmitAdviceFormDTO.java
@@ -0,0 +1,13 @@
+package com.epmet.resi.mine.dto.from;
+
+import lombok.Data;
+
+/**
+ * @description: 提交建议DTO
+ * @author: liushaowen
+ * @date: 2020/11/5 10:35
+ */
+
+@Data
+public class SubmitAdviceFormDTO {
+}
diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/BadgeListResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/BadgeListResultDTO.java
new file mode 100644
index 0000000000..d32230501e
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/BadgeListResultDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.resi.mine.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 11:08 上午
+ */
+@Data
+public class BadgeListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -6542233940679158922L;
+
+    /**
+     * 徽章ID
+     */
+    private String badgeId;
+
+    /**
+     * 徽章图片地址
+     */
+    private String badgeIcon;
+
+    /**
+     * 徽章是否点亮
+     */
+    private String isOpened;
+
+    private String badgeType;
+}
diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java
new file mode 100644
index 0000000000..f89028a9dd
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java
@@ -0,0 +1,39 @@
+package com.epmet.resi.mine.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/3 9:58
+ */
+@Data
+public class InitInfoResultDTO implements Serializable {
+	private static final long serialVersionUID = 144944007101324497L;
+	/**
+	 * 头像
+	 */
+	private String headImgUrl;
+	/**
+	 * 姓
+	 */
+	private String surname;
+	/**
+	 * 名
+	 */
+	private String name;
+	/**
+	 * 路牌号
+	 */
+	private String street;
+	/**
+	 * 小区名称
+	 */
+	private String district;
+	/**
+	 * 详细地址
+	 */
+	private String buildingAddress;
+}
diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/OperListResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/OperListResultDTO.java
new file mode 100644
index 0000000000..d202918818
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/OperListResultDTO.java
@@ -0,0 +1,51 @@
+package com.epmet.resi.mine.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 4:20 下午
+ */
+@Data
+public class OperListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -6185696177370545937L;
+
+    /**
+     * 徽章ID
+     */
+    private String badgeId;
+
+    /**
+     * 徽章名字
+     */
+    private String badgeName;
+
+    /**
+     * 点亮状态 yes：已点亮，no：未点亮
+     */
+    private String isLighted;
+
+    /**
+     * 是否认证 yes 认证 no 已认证
+     */
+    private String isCertificated;
+
+    /**
+     * 徽章图片地址
+     */
+    private String badgeIcon;
+
+    /**
+     * 是否被驳回  true：已驳回，false：未驳回
+     */
+    private Boolean isReject;
+
+    /**
+     * 徽章类型：党员徽章；party，无：none
+     */
+    private String badgeType;
+
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/controller/AdviceController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/controller/AdviceController.java
new file mode 100644
index 0000000000..b06c7b3592
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/controller/AdviceController.java
@@ -0,0 +1,53 @@
+package com.epmet.modules.advice.controller;
+
+import com.epmet.commons.tools.security.user.LoginUserUtil;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.modules.advice.service.AdviceService;
+import com.epmet.resi.mine.dto.from.MyAdviceListFormDTO;
+import com.epmet.resi.mine.dto.from.SubmitAdviceFormDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description: 用户建议controller
+ * @author: liushaowen
+ * @date: 2020/11/5 9:34
+ */
+@RestController
+@RequestMapping("advice")
+public class AdviceController {
+    @Autowired
+    private AdviceService adviceService;
+
+    @Autowired
+    private LoginUserUtil loginUserUtil;
+
+    /**
+     * @Description 提交建议
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author liushaowen
+     * @Date 2020/11/5 10:37
+     */
+    @PostMapping("submitadvice")
+    public Result submitAdvice(SubmitAdviceFormDTO dto){
+        ValidatorUtils.validateEntity(dto);
+        return adviceService.submitAdvice(dto);
+    }
+
+    /**
+     * @Description 我的建议列表
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author liushaowen
+     * @Date 2020/11/5 13:26
+     */
+    @PostMapping("myadvicelist")
+    public Result getMyAdviceList(MyAdviceListFormDTO dto){
+        ValidatorUtils.validateEntity(dto);
+        return adviceService.getMyAdviceList(dto);
+    }
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/service/AdviceService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/service/AdviceService.java
new file mode 100644
index 0000000000..af9eabd547
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/service/AdviceService.java
@@ -0,0 +1,11 @@
+package com.epmet.modules.advice.service;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.mine.dto.from.MyAdviceListFormDTO;
+import com.epmet.resi.mine.dto.from.SubmitAdviceFormDTO;
+
+public interface AdviceService {
+    Result submitAdvice(SubmitAdviceFormDTO dto);
+
+    Result getMyAdviceList(MyAdviceListFormDTO dto);
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/service/impl/AdviceServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/service/impl/AdviceServiceImpl.java
new file mode 100644
index 0000000000..6f751622b1
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/service/impl/AdviceServiceImpl.java
@@ -0,0 +1,41 @@
+package com.epmet.modules.advice.service.impl;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.modules.advice.service.AdviceService;
+import com.epmet.resi.mine.dto.from.MyAdviceListFormDTO;
+import com.epmet.resi.mine.dto.from.SubmitAdviceFormDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description:
+ * @author: liushaowen
+ * @date: 2020/11/5 10:27
+ */
+@Service
+public class AdviceServiceImpl implements AdviceService {
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    /***
+     * 提交建议
+     * @param dto
+     * @return
+     */
+    @Override
+    public Result submitAdvice(SubmitAdviceFormDTO dto) {
+        return null;
+    }
+
+    /**
+     * @Description 我的建议列表
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author liushaowen
+     * @Date 2020/11/5 10:40
+     */
+    @Override
+    public Result getMyAdviceList(MyAdviceListFormDTO dto) {
+        return null;
+    }
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/badege/controller/BadgeController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/badege/controller/BadgeController.java
new file mode 100644
index 0000000000..727e1ee1ae
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/badege/controller/BadgeController.java
@@ -0,0 +1,84 @@
+package com.epmet.modules.badege.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.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.OpenedOrClosedFormDTO;
+import com.epmet.modules.badege.service.BadgeService;
+import com.epmet.resi.mine.dto.from.BadgeListFormDTO;
+import com.epmet.dto.form.CertificationAddFormDTO;
+import com.epmet.resi.mine.dto.from.OperListFormDTO;
+import com.epmet.resi.mine.dto.result.BadgeListResultDTO;
+import com.epmet.resi.mine.dto.result.OperListResultDTO;
+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 zxc
+ * @DateTime 2020/11/3 10:42 上午
+ */
+@RestController
+@RequestMapping("badge")
+public class BadgeController {
+
+    @Autowired
+    private BadgeService badgeService;
+
+    /**
+     * @Description  个人中心-获取个人徽章点亮列表
+     * @Param badgeListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:11 下午
+     */
+    @PostMapping("list")
+    public Result<List<BadgeListResultDTO>> getBadgeList(@LoginUser TokenDto tokenDto,@RequestBody BadgeListFormDTO badgeListFormDTO){
+        ValidatorUtils.validateEntity(badgeListFormDTO, BadgeListFormDTO.BadgeList.class);
+        return new Result<List<BadgeListResultDTO>>().ok(badgeService.getBadgeList(tokenDto,badgeListFormDTO));
+    }
+
+    /**
+     * @Description 个人中心-获取徽章可操作列表（点亮，取消，认证）
+     * @Param operListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:28 下午
+     */
+    @PostMapping("operlist")
+    public Result<List<OperListResultDTO>> getOperList(@LoginUser TokenDto tokenDto,@RequestBody OperListFormDTO operListFormDTO){
+        ValidatorUtils.validateEntity(operListFormDTO, OperListFormDTO.OperList.class);
+        return new Result<List<OperListResultDTO>>().ok(badgeService.getOperList(tokenDto,operListFormDTO));
+    }
+
+    /**
+     * @Description  个人中心-提交徽章认证
+     * @Param tokenDto
+     * @Param certificationAddFormDTO
+     * @author zxc
+     * @date 2020/11/4 11:16 上午
+     */
+    @PostMapping("certification/add")
+    public Result certificationAdd(@LoginUser TokenDto tokenDto,@RequestBody CertificationAddFormDTO certificationAddFormDTO){
+        ValidatorUtils.validateEntity(certificationAddFormDTO, CertificationAddFormDTO.CertificationAdd.class);
+        return badgeService.certificationAdd(tokenDto,certificationAddFormDTO);
+    }
+
+    /**
+     * @Description  个人中心-取消/点亮徽章
+     * @Param openedOrClosedFormDTO
+     * @author zxc
+     * @date 2020/11/5 9:23 上午
+     */
+    @PostMapping("openedorclosed")
+    public Result openedOrClosed(@LoginUser TokenDto tokenDto,@RequestBody OpenedOrClosedFormDTO openedOrClosedFormDTO){
+        ValidatorUtils.validateEntity(openedOrClosedFormDTO, OpenedOrClosedFormDTO.OpenedOrClosed.class);
+        badgeService.openedOrClosed(tokenDto,openedOrClosedFormDTO);
+        return new Result();
+    }
+
+
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/badege/service/BadgeService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/badege/service/BadgeService.java
new file mode 100644
index 0000000000..c9da1f12ed
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/badege/service/BadgeService.java
@@ -0,0 +1,53 @@
+package com.epmet.modules.badege.service;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.OpenedOrClosedFormDTO;
+import com.epmet.resi.mine.dto.from.BadgeListFormDTO;
+import com.epmet.dto.form.CertificationAddFormDTO;
+import com.epmet.resi.mine.dto.from.OperListFormDTO;
+import com.epmet.resi.mine.dto.result.BadgeListResultDTO;
+import com.epmet.resi.mine.dto.result.OperListResultDTO;
+
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 10:52 上午
+ */
+public interface BadgeService {
+
+    /**
+     * @Description  个人中心-获取个人徽章点亮列表
+     * @Param badgeListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:11 下午
+     */
+    List<BadgeListResultDTO> getBadgeList(TokenDto tokenDto,BadgeListFormDTO badgeListFormDTO);
+
+    /**
+     * @Description 个人中心-获取徽章可操作列表（点亮，取消，认证）
+     * @Param operListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:28 下午
+     */
+    List<OperListResultDTO> getOperList(TokenDto tokenDto,OperListFormDTO operListFormDTO);
+
+    /**
+     * @Description  个人中心-提交徽章认证
+     * @Param tokenDto
+     * @Param certificationAddFormDTO
+     * @author zxc
+     * @date 2020/11/4 11:16 上午
+     */
+    Result certificationAdd(TokenDto tokenDto, CertificationAddFormDTO certificationAddFormDTO);
+
+    /**
+     * @Description 个人中心-取消/点亮徽章
+     * @Param openedOrClosedFormDTO
+     * @author zxc
+     * @date 2020/11/5 9:23 上午
+     */
+    void openedOrClosed(TokenDto tokenDto,OpenedOrClosedFormDTO openedOrClosedFormDTO);
+
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/badege/service/impl/BadgeServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/badege/service/impl/BadgeServiceImpl.java
new file mode 100644
index 0000000000..53057f9492
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/badege/service/impl/BadgeServiceImpl.java
@@ -0,0 +1,109 @@
+package com.epmet.modules.badege.service.impl;
+
+import com.epmet.commons.tools.exception.RenException;
+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.dto.form.OpenedOrClosedFormDTO;
+import com.epmet.dto.form.UserBadgeListFormDTO;
+import com.epmet.dto.form.UserOperListFormDTO;
+import com.epmet.dto.result.UserBadgeListResultDTO;
+import com.epmet.dto.result.UserOperListResultDTO;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.modules.badege.service.BadgeService;
+import com.epmet.resi.mine.dto.from.BadgeListFormDTO;
+import com.epmet.dto.form.CertificationAddFormDTO;
+import com.epmet.resi.mine.dto.from.OperListFormDTO;
+import com.epmet.resi.mine.dto.result.BadgeListResultDTO;
+import com.epmet.resi.mine.dto.result.OperListResultDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 10:53 上午
+ */
+@Service
+@Slf4j
+public class BadgeServiceImpl implements BadgeService {
+
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
+    /**
+     * @Description  个人中心-获取个人徽章点亮列表
+     * @Param badgeListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:11 下午
+     */
+    @Override
+    public List<BadgeListResultDTO> getBadgeList(TokenDto tokenDto,BadgeListFormDTO badgeListFormDTO) {
+        UserBadgeListFormDTO form = new UserBadgeListFormDTO();
+        form.setCustomerId(badgeListFormDTO.getCustomerId());
+        form.setUserId(tokenDto.getUserId());
+        Result<List<UserBadgeListResultDTO>> listResult = epmetUserOpenFeignClient.selectBadgeList(form);
+        if (!listResult.success()){
+            throw new RenException("获取徽章点亮列表失败......");
+        }
+        if (null == listResult.getData()){
+            return new ArrayList<>();
+        }
+        List<BadgeListResultDTO> result = ConvertUtils.sourceToTarget(listResult.getData(), BadgeListResultDTO.class);
+        return result;
+    }
+
+    /**
+     * @Description 个人中心-获取徽章可操作列表（点亮，取消，认证）
+     * @Param operListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:28 下午
+     */
+    @Override
+    public List<OperListResultDTO> getOperList(TokenDto tokenDto,OperListFormDTO operListFormDTO) {
+        UserOperListFormDTO userOperListFormDTO = new UserOperListFormDTO();
+        userOperListFormDTO.setCustomerId(operListFormDTO.getCustomerId());
+        userOperListFormDTO.setUserId(tokenDto.getUserId());
+        Result<List<UserOperListResultDTO>> listResult = epmetUserOpenFeignClient.selectOperList(userOperListFormDTO);
+        if (!listResult.success()){
+            throw new RenException("获取徽章列表失败......");
+        }
+        if (null == listResult.getData()){
+            return new ArrayList<>();
+        }
+        List<OperListResultDTO> result = ConvertUtils.sourceToTarget(listResult.getData(), OperListResultDTO.class);
+        return result;
+    }
+
+    /**
+     * @Description  个人中心-提交徽章认证
+     * @Param tokenDto
+     * @Param certificationAddFormDTO
+     * @author zxc
+     * @date 2020/11/4 11:16 上午
+     */
+    @Override
+    public Result certificationAdd(TokenDto tokenDto, CertificationAddFormDTO certificationAddFormDTO) {
+        certificationAddFormDTO.setUserId(tokenDto.getUserId());
+        Result result = epmetUserOpenFeignClient.authBadgeRecord(certificationAddFormDTO);
+        return result;
+    }
+
+    /**
+     * @Description  个人中心-取消/点亮徽章
+     * @Param openedOrClosedFormDTO
+     * @author zxc
+     * @date 2020/11/5 9:23 上午
+     */
+    @Override
+    public void openedOrClosed(TokenDto tokenDto,OpenedOrClosedFormDTO openedOrClosedFormDTO) {
+        openedOrClosedFormDTO.setUserId(tokenDto.getUserId());
+        Result result = epmetUserOpenFeignClient.openedOrClosed(openedOrClosedFormDTO);
+        if (!result.success()){
+            throw new RenException("取消/点亮徽章失败了......");
+        }
+    }
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/PersonalCenterController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/PersonalCenterController.java
new file mode 100644
index 0000000000..61c538fbdc
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/PersonalCenterController.java
@@ -0,0 +1,55 @@
+package com.epmet.modules.mine.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.EditInfoFormDTO;
+import com.epmet.modules.mine.service.PersonalCenterService;
+import com.epmet.resi.mine.dto.result.InitInfoResultDTO;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+/**
+ * 个人中心
+ * @author zhaoqifeng
+ * @date 2020/11/3 9:48
+ */
+@Slf4j
+@RestController
+@RequestMapping("personalcenter")
+public class PersonalCenterController {
+	@Autowired
+	private PersonalCenterService personalCenterService;
+
+	/**
+	 * 修改信息页面初始化
+	 * @author zhaoqifeng
+	 * @date 2020/11/3 10:03
+	 * @param tokenDto
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.mine.dto.result.InitInfoResultDTO>
+	 */
+	@PostMapping("initinfo")
+	public Result<InitInfoResultDTO> initInfo(@LoginUser TokenDto tokenDto) {
+		InitInfoResultDTO resultDTO =  personalCenterService.initInfo(tokenDto);
+		return new Result<InitInfoResultDTO>().ok(resultDTO);
+
+	}
+
+	/**
+	 * 修改信息
+	 * @author zhaoqifeng
+	 * @date 2020/11/3 10:03
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	@PostMapping("editinfo")
+	public Result editInfo(@LoginUser TokenDto tokenDto, @RequestBody EditInfoFormDTO formDTO) {
+		personalCenterService.editInfo(tokenDto, formDTO);
+		return new Result();
+	}
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/PersonalCenterService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/PersonalCenterService.java
new file mode 100644
index 0000000000..219edb8c86
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/PersonalCenterService.java
@@ -0,0 +1,17 @@
+package com.epmet.modules.mine.service;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.form.EditInfoFormDTO;
+import com.epmet.resi.mine.dto.result.InitInfoResultDTO;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/3 9:50
+ */
+public interface PersonalCenterService {
+
+	InitInfoResultDTO initInfo(TokenDto tokenDto);
+
+	void editInfo(TokenDto tokenDto, EditInfoFormDTO formDTO);
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java
new file mode 100644
index 0000000000..142d82d6dd
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java
@@ -0,0 +1,51 @@
+package com.epmet.modules.mine.service.impl;
+
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.EditInfoFormDTO;
+import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.modules.mine.service.PersonalCenterService;
+import com.epmet.resi.mine.dto.result.InitInfoResultDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/3 9:50
+ */
+@Slf4j
+@Service
+public class PersonalCenterServiceImpl implements PersonalCenterService {
+
+	@Autowired
+	private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
+	@Override
+	public InitInfoResultDTO initInfo(TokenDto tokenDto) {
+		Result<ResiUserBaseInfoResultDTO> baseInfoResult =  epmetUserOpenFeignClient.selectUserBaseInfo(tokenDto);
+		if (!baseInfoResult.success()) {
+			throw new RenException(baseInfoResult.getCode(), baseInfoResult.getMsg());
+		}
+		InitInfoResultDTO resultDTO = new InitInfoResultDTO();
+		resultDTO.setHeadImgUrl(baseInfoResult.getData().getHeadImgUrl());
+		resultDTO.setSurname(baseInfoResult.getData().getSurname());
+		resultDTO.setName(baseInfoResult.getData().getName());
+		resultDTO.setStreet(baseInfoResult.getData().getStreet());
+		resultDTO.setDistrict(baseInfoResult.getData().getDistrict());
+		resultDTO.setBuildingAddress(baseInfoResult.getData().getBuildingAddress());
+		return resultDTO;
+	}
+
+	@Override
+	public void editInfo(TokenDto tokenDto, EditInfoFormDTO formDTO) {
+		formDTO.setUserId(tokenDto.getUserId());
+		Result result = epmetUserOpenFeignClient.editUserInfo(formDTO);
+		if (!result.success()) {
+			throw new RenException(result.getCode(), result.getMsg());
+		}
+	}
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java
new file mode 100644
index 0000000000..131e4a9203
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java
@@ -0,0 +1,45 @@
+package com.epmet.constant;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 2:45 下午
+ */
+public interface BadgeConstant {
+
+    String BADGE_KEY = "epmet:badge:customer:";
+
+    String BADGE = "badge";
+
+    String DEFAULT_CUSTOMER = "default";
+
+    String YES = "yes";
+
+    String NO = "no";
+
+    String REJECTED = "rejected";
+
+    String APPROVED = "approved";
+
+    String NONE ="none";
+
+    String SMS_CODE_KEY = "epmet:smsCode:badge:";
+
+    String PARTY ="party";
+
+    String ONLINE ="online";
+
+    String OFFLINE ="offline";
+
+    String RESI = "resi";
+
+    String AUTH_TITLE = "您有一条认证消息";
+
+    String GET_BADGE_NAME_FAILURE = "获取徽章名称失败......";
+
+    String MESSAGE_CONTENT = "您好，您的%s因认证失败未成功点亮，请查看";
+
+    String READ_FLAG = "unread";
+
+    String DEFAULT = "default";
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeCertificationConfigDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeCertificationConfigDTO.java
new file mode 100644
index 0000000000..5eb6e95749
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeCertificationConfigDTO.java
@@ -0,0 +1,86 @@
+/**
+ * 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 2020-11-03
+ */
+@Data
+public class BadgeCertificationConfigDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 客户Id 默认配置id：default
+     */
+	private String customerId;
+
+    /**
+     * 徽章ID
+     */
+	private String badgeId;
+
+    /**
+     * 认证信息类型 手机号:mobile；全名:fullname;身份证:idcard;认证证件: certificate;认证说明(备注):remark
+     */
+	private String certificationType;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeDTO.java
new file mode 100644
index 0000000000..dfeb6f055b
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeDTO.java
@@ -0,0 +1,96 @@
+/**
+ * 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 2020-11-03
+ */
+@Data
+public class BadgeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 客户Id 默认配置id：default
+     */
+	private String customerId;
+
+    /**
+     * 徽章名称
+     */
+	private String badgeName;
+
+    /**
+     * 徽章图标url
+     */
+	private String badgeIcon;
+
+    /**
+     * 固有徽章类型 前端页面跳转标识，党员徽章：party;无：none
+     */
+	private String fixationBadgeType;
+
+    /**
+     * 状态 上线:online;下线:offline;
+     */
+	private String badgeStatus;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ResiUserBadgeDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ResiUserBadgeDTO.java
new file mode 100644
index 0000000000..21e910101f
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ResiUserBadgeDTO.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 2020-11-06
+ */
+@Data
+public class ResiUserBadgeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 客户Id 默认配置id：default
+     */
+	private String customerId;
+
+    /**
+     * 用户注册网格ID
+     */
+	private String gridId;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 徽章ID
+     */
+	private String badgeId;
+
+    /**
+     * 是否开启(点亮) 1:点亮；0:未点亮
+     */
+	private Integer isOpened;
+
+    /**
+     * 认证(审核)状态 待审核:auditing;审核通过:pass;驳回:rejected;
+     */
+	private String certificationAutidStatus;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceDTO.java
new file mode 100644
index 0000000000..77e6494ee6
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceDTO.java
@@ -0,0 +1,156 @@
+/**
+ * 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;
+
+
+/**
+ * user_advice
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-06
+ */
+@Data
+public class UserAdviceDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 客户名
+     */
+	private String customerName;
+
+    /**
+     * 组织ID
+     */
+	private String agencyId;
+
+    /**
+     * 组织名
+     */
+	private String agencyName;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 网格名
+     */
+	private String gridName;
+
+    /**
+     * userid
+     */
+	private String userId;
+
+    /**
+     * 用户姓名
+     */
+	private String userName;
+
+    /**
+     * 用户注册手机号
+     */
+	private String regPhone;
+
+    /**
+     * 建议描述
+     */
+	private String adviceContent;
+
+    /**
+     * 填写手机号
+     */
+	private String phone;
+
+    /**
+     * 问题分类(gov政府software软件,逗号分隔)
+     */
+	private String adviceType;
+
+    /**
+     * 回复内容
+     */
+	private String replyContent;
+
+    /**
+     * 回复人id
+     */
+	private String replyUserId;
+
+    /**
+     * 回复人姓名
+     */
+	private String replyUserName;
+
+    /**
+     * 回复时间
+     */
+	private Date replyTime;
+
+    /**
+     * 政府存证文字
+     */
+	private String govContent;
+
+    /**
+     * 删除标志
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceImgDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceImgDTO.java
new file mode 100644
index 0000000000..cb39a925d5
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceImgDTO.java
@@ -0,0 +1,86 @@
+/**
+ * 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 qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-04
+ */
+@Data
+public class UserAdviceImgDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 建议id
+     */
+	private String adviceId;
+
+    /**
+     * 类型，resi为用户上传,oper为运营上传
+     */
+    private String type;
+
+    /**
+     * 图片url
+     */
+	private String imgUrl;
+
+    /**
+     * 删除标志
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserBadgeCertificateRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserBadgeCertificateRecordDTO.java
new file mode 100644
index 0000000000..820f0fa45c
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserBadgeCertificateRecordDTO.java
@@ -0,0 +1,45 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/4 1:46 下午
+ */
+@Data
+public class UserBadgeCertificateRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 3207509834642386145L;
+    private String id;
+    private String customerId;
+    private String gridId;
+    private String userId;
+    private String badgeId;
+    private String surname;
+    private String name;
+    private String mobile;
+    private String idNum;
+    private String certificationImg;
+    private String remark;
+    private String auditStatus;
+    private String auditRemark;
+    private String staffId;
+    private Date auditTime;
+    private String isLast;
+    private String delFlag;
+    private Integer revision;
+    private String createdBy;
+    private String updatedBy;
+
+    public UserBadgeCertificateRecordDTO() {
+        this.auditStatus = "auditing";
+        this.isLast = "yes";
+        this.delFlag = "0";
+        this.revision = 0;
+        this.createdBy = "APP_USER";
+        this.updatedBy = "APP_USER";
+    }
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddBadgeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddBadgeFormDTO.java
new file mode 100644
index 0000000000..ceb07d1651
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddBadgeFormDTO.java
@@ -0,0 +1,42 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/4 9:47
+ */
+@NoArgsConstructor
+@Data
+public class AddBadgeFormDTO implements Serializable {
+
+	private static final long serialVersionUID = -5220529162950147825L;
+	/**
+	 * 徽章名称
+	 */
+	@NotBlank(message = "徽章名称不能为空")
+	private String badgeName;
+	/**
+	 * 徽章图标
+	 */
+	@NotBlank(message = "徽章图标不能为空")
+	private String badgeIcon;
+	/**
+	 * 徽章状态 上线:online;下线:offline;
+	 */
+	@NotBlank(message = "徽章状态不能为空")
+	private String badgeStatus;
+	/**
+	 * 认证信息类型数组 手机号:mobile；姓名:fullname;身份证:idcard;认证证件: certificate;认证说明(备注):remark
+	 */
+	@NotEmpty(message = "认证信息类型不能为空")
+	private List<String> certificationTypes;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java
new file mode 100644
index 0000000000..1e001b988a
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java
@@ -0,0 +1,56 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import java.util.Date;
+
+/**
+ * @description:
+ * @author: liushaowen
+ * @date: 2020/11/9 10:37
+ */
+@Data
+public class AdviceListFormDTO {
+    /**
+     * 客户id 不填查询所有
+     */
+    private String customerId;
+
+    /**
+     * 组织id 不填查询所有
+     */
+    private String agencyId;
+
+    /**
+     * 是否被回复,0未回复，1回复, 传空查询所有
+     */
+    private String isReply;
+
+    /**
+     * 问题类型 gov政府,software软件 ,传空查询全部，单选
+     */
+    private String adviceType;
+
+    /**
+     * 开始时间 可不填
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间 可不填
+     */
+    private Date endTime;
+
+    /**
+     * 页码
+     */
+    @Min(1)
+    private int pageNo;
+
+    /**
+     * 页大小
+     */
+    @Min(1)
+    private int pageSize;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AuthFieldFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AuthFieldFormDTO.java
new file mode 100644
index 0000000000..b5c716470f
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AuthFieldFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/4 4:54 下午
+ */
+@Data
+public class AuthFieldFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1976515427065841752L;
+
+    public interface AuthField{}
+
+    @NotBlank(message = "客户ID不能为空",groups = {AuthField.class})
+    private String customerId;
+
+    @NotBlank(message = "徽章ID不能为空",groups = {AuthField.class})
+    private String badgeId;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeAuditFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeAuditFormDTO.java
new file mode 100644
index 0000000000..f7d3deac7d
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeAuditFormDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/5 11:06
+ */
+@NoArgsConstructor
+@Data
+public class BadgeAuditFormDTO implements Serializable {
+	private static final long serialVersionUID = 2209535364555130964L;
+	private String recordId;
+	private String auditStatus;
+	private String auditRemark;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeFormDTO.java
new file mode 100644
index 0000000000..5a40b86f0f
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeFormDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/4 14:22
+ */
+@Data
+public class BadgeFormDTO implements Serializable {
+	private static final long serialVersionUID = 9156247659994638103L;
+	private String badgeId;
+	/**
+	 * 页码
+	 */
+	private Integer pageNo = 1;
+	/**
+	 * 每页显示数量
+	 */
+	private Integer pageSize = 20;
+	/**
+	 * 网格Id
+	 */
+	private String gridId;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeSendCodeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeSendCodeFormDTO.java
new file mode 100644
index 0000000000..14cb3c3333
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeSendCodeFormDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/4 3:11 下午
+ */
+@Data
+public class BadgeSendCodeFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3926070129364657241L;
+
+    public interface BadgeSendCode{}
+
+    @NotBlank(message = "手机号不能为空", groups = {BadgeSendCode.class})
+    private String mobile;
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java
new file mode 100644
index 0000000000..feef1ee323
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java
@@ -0,0 +1,67 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/4 11:05 上午
+ */
+@Data
+public class CertificationAddFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1330773325803513330L;
+
+    public interface CertificationAdd{}
+
+    private String userId;
+
+    /**
+     * 客户ID
+     */
+    @NotBlank(message = "客户ID不能为空",groups = {CertificationAdd.class})
+    private String customerId;
+
+    /**
+     * 徽章ID
+     */
+    private String badgeId;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 姓
+     */
+    private String surname;
+
+    /**
+     * 名
+     */
+    private String name;
+
+    /**
+     * 身份证号
+     */
+    private String idcard;
+
+    /**
+     * 认证证件图片url
+     */
+    private String certificationImg;
+
+    /**
+     * 认证说明
+     */
+    private String remark;
+
+    /**
+     * 验证码
+     */
+    private String code;
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationDetailFormDTO.java
new file mode 100644
index 0000000000..1eea42f575
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationDetailFormDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/4 3:51 下午
+ */
+@Data
+public class CertificationDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -398879254354767770L;
+
+    public interface CertificationDetail{}
+
+    @NotBlank(message = "客户ID不能为空",groups = {CertificationDetail.class})
+    private String customerId;
+
+    @NotBlank(message = "徽章ID不能为空",groups = {CertificationDetail.class})
+    private String badgeId;
+
+    /**
+     * 客户ID
+     */
+    private String userId;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditBadgeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditBadgeFormDTO.java
new file mode 100644
index 0000000000..e11d2e107c
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditBadgeFormDTO.java
@@ -0,0 +1,40 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/4 14:23
+ */
+@Data
+public class EditBadgeFormDTO implements Serializable {
+	private static final long serialVersionUID = 1578890423002035200L;
+	private String badgeId;
+	/**
+	 * 徽章名称
+	 */
+	@NotBlank(message = "徽章名称不能为空")
+	private String badgeName;
+	/**
+	 * 徽章图标
+	 */
+	@NotBlank(message = "徽章图标不能为空")
+	private String badgeIcon;
+	/**
+	 * 徽章状态 上线:online;下线:offline;
+	 */
+	@NotBlank(message = "徽章状态不能为空")
+	private String badgeStatus;
+	/**
+	 * 认证信息类型数组 手机号:mobile；姓名:fullname;身份证:idcard;认证证件: certificate;认证说明(备注):remark
+	 */
+	@NotEmpty(message = "认证信息类型不能为空")
+	private List<String> certificationTypes;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java
new file mode 100644
index 0000000000..d6d9655b88
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java
@@ -0,0 +1,52 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/3 9:55
+ */
+@NoArgsConstructor
+@Data
+public class EditInfoFormDTO implements Serializable {
+
+	private static final long serialVersionUID = 1280489016677129419L;
+	/**
+	 * 头像
+	 */
+	@NotBlank(message = "头像不能为空")
+	private String userId;
+	/**
+	 * 头像
+	 */
+	@NotBlank(message = "头像不能为空")
+	private String headImgUrl;
+	/**
+	 * 姓
+	 */
+	@NotBlank(message = "姓不能为空")
+	private String surname;
+	/**
+	 * 名
+	 */
+	@NotBlank(message = "名不能为空")
+	private String name;
+	/**
+	 * 路牌号
+	 */
+	@NotBlank(message = "路牌号不能为空")
+	private String street;
+	/**
+	 * 小区名称
+	 */
+	private String district;
+	/**
+	 * 详细地址
+	 */
+	private String buildingAddress;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OpenedOrClosedFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OpenedOrClosedFormDTO.java
new file mode 100644
index 0000000000..15353d9685
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OpenedOrClosedFormDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/4 5:43 下午
+ */
+@Data
+public class OpenedOrClosedFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 483466676158603066L;
+
+    public interface OpenedOrClosed{}
+
+    @NotBlank(message = "客户ID不能为空",groups = {OpenedOrClosed.class})
+    private String customerId;
+
+    private String userId;
+
+    @NotBlank(message = "徽章ID不能为空",groups = {OpenedOrClosed.class})
+    private String badgeId;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OperAdviceListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OperAdviceListFormDTO.java
new file mode 100644
index 0000000000..e4c046e53c
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OperAdviceListFormDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @author: liushaowen
+ * @date: 2020/11/5 17:25
+ */
+@Data
+public class OperAdviceListFormDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String customerId;
+
+    private String isReply;
+
+    private String adviceType;
+
+    private String startTime;
+
+    private String endTime;
+
+    @Min(1)
+    private Integer pageNo;
+
+    @Min(1)
+    private Integer pageSize;
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ReplyAdviceFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ReplyAdviceFormDTO.java
new file mode 100644
index 0000000000..f353919247
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ReplyAdviceFormDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @description:回复建议FormDTO
+ * @author: liushaowen
+ * @date: 2020/11/6 10:37
+ */
+@Data
+public class ReplyAdviceFormDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @NotBlank(message = "adviceId不能为空")
+    private String adviceId;
+
+    @NotBlank(message = "回复内容不能为空")
+    private String replyContent;
+
+    private List<String> govImgList;
+
+    private String govContent;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBadgeListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBadgeListFormDTO.java
new file mode 100644
index 0000000000..2cb7f728dc
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBadgeListFormDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 11:07 上午
+ */
+@Data
+public class UserBadgeListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 9002922684993474574L;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    public UserBadgeListFormDTO(String userId, String customerId) {
+        this.userId = userId;
+        this.customerId = customerId;
+    }
+
+    public UserBadgeListFormDTO() {
+    }
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBadgeUnitFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBadgeUnitFormDTO.java
new file mode 100644
index 0000000000..406f527bb9
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBadgeUnitFormDTO.java
@@ -0,0 +1,48 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * @Description 用户-徽章缓存单元
+ * @ClassName UserBadgeUnitFormDTO
+ * @Auth wangc
+ * @Date 2020-11-05 10:00
+ */
+@Data
+public class UserBadgeUnitFormDTO implements Serializable {
+    private static final long serialVersionUID = -4497394865738168850L;
+
+    /**
+     * 徽章Id
+     */
+    private String badgeId;
+
+    /**
+     * 徽章图标  url
+     */
+    private String badgeIcon;
+
+    /**
+     * 徽章名称
+     */
+    private String badgeName;
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        UserBadgeUnitFormDTO that = (UserBadgeUnitFormDTO) o;
+        return badgeId.equals(that.badgeId) &&
+                badgeIcon.equals(that.badgeIcon) &&
+                badgeName.equals(that.badgeName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(badgeId, badgeIcon, badgeName);
+    }
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserOperListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserOperListFormDTO.java
new file mode 100644
index 0000000000..84578f7abb
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserOperListFormDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 4:18 下午
+ */
+@Data
+public class UserOperListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -1872129597916414712L;
+
+    private String userId;
+
+    private String customerId;
+
+    public UserOperListFormDTO(String userId, String customerId) {
+        this.userId = userId;
+        this.customerId = customerId;
+    }
+
+    public UserOperListFormDTO() {
+    }
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceDetailResultDTO.java
new file mode 100644
index 0000000000..2f8bbbc262
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceDetailResultDTO.java
@@ -0,0 +1,99 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: liushaowen
+ * @date: 2020/11/5 17:37
+ */
+@Data
+public class AdviceDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 建议id
+     */
+    private String adviceId;
+
+    /**
+     * 客户名
+     */
+    private String customerName;
+
+    /**
+     * 组织名
+     */
+    private String agencyName;
+
+    /**
+     * 网格名
+     */
+    private String gridName;
+
+    /**
+     * 注册电话
+     */
+    private String regPhone;
+
+    /**
+     * 意见类型
+     */
+    private String adviceType;
+
+    /**
+     * 提建议人姓名
+     */
+    private String userName;
+
+    /**
+     * 建议内容
+     */
+    private String adviceContent;
+
+    /**
+     * 填写的电话
+     */
+    private String phone;
+
+    /**
+     * 建议时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date adviceTime;
+
+    /**
+     * 回复内容
+     */
+    private String replyContent;
+
+    /**
+     * 回复时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date replyTime;
+
+    /**
+     * 回复人姓名
+     */
+    private String replyUserName;
+
+    /**
+     * 建议图片列表
+     */
+    private List<String> imgList;
+
+    /**
+     * 政府回应图片
+     */
+    private List<String> govImgList;
+
+    /**
+     * 政府回应文字
+     */
+    private String govContent;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AuthFieldResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AuthFieldResultDTO.java
new file mode 100644
index 0000000000..9c68bf19af
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AuthFieldResultDTO.java
@@ -0,0 +1,40 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/4 4:54 下午
+ */
+@Data
+public class AuthFieldResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1856490232343125419L;
+
+    /**
+     * 中文名
+     */
+    private String cnName;
+
+    /**
+     * 英文名【字段】
+     */
+    private String enName;
+
+    /**
+     * 字段类型，text：文本，img：图片
+     */
+    private String fieldType;
+
+    /**
+     * 是否必填
+     */
+    private String isRequired;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditRecordResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditRecordResultDTO.java
new file mode 100644
index 0000000000..363441ad46
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditRecordResultDTO.java
@@ -0,0 +1,43 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/5 10:57
+ */
+@Data
+public class BadgeAuditRecordResultDTO implements Serializable {
+	private static final long serialVersionUID = 6004101838042628105L;
+	/**
+	 * 徽章Id
+	 */
+	private String badgeId;
+	/**
+	 * 徽章名称
+	 */
+	private String badgeName;
+	/**
+	 * 徽章图标url
+	 */
+	private String badgeIcon;
+	/**
+	 * 用户Id
+	 */
+	private String userId;
+	/**
+	 * 用户名
+	 */
+	private String userName;
+	/**
+	 * 创建时间
+	 */
+	private Long createTime;
+	/**
+	 * 用户名
+	 */
+	private String auditStatus;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditingResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditingResultDTO.java
new file mode 100644
index 0000000000..bbf6381d82
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditingResultDTO.java
@@ -0,0 +1,43 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/5 9:34
+ */
+@NoArgsConstructor
+@Data
+public class BadgeAuditingResultDTO implements Serializable {
+
+	private static final long serialVersionUID = -361914591952483084L;
+	/**
+	 * 徽章Id
+	 */
+	private String badgeId;
+	/**
+	 * 徽章名称
+	 */
+	private String badgeName;
+	/**
+	 * 徽章图标url
+	 */
+	private String badgeIcon;
+	/**
+	 * 用户Id
+	 */
+	private String userId;
+	/**
+	 * 用户名
+	 */
+	private String userName;
+	/**
+	 * 创建时间
+	 */
+	private Long createTime;
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeDetailResultDTO.java
new file mode 100644
index 0000000000..311c78f460
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeDetailResultDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/4 14:17
+ */
+@NoArgsConstructor
+@Data
+public class BadgeDetailResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 7698898330565297328L;
+
+	private String badgeId;
+	private String badgeName;
+	private String badgeIcon;
+	private String badgeStatus;
+	private List<String> certificationTypes;
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeListResultDTO.java
new file mode 100644
index 0000000000..8d5d7c28ec
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeListResultDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/3 16:58
+ */
+@NoArgsConstructor
+@Data
+public class BadgeListResultDTO {
+
+	/**
+	 * 徽章Id
+	 */
+	private String badgeId;
+	/**
+	 * 徽章名称
+	 */
+	private String badgeName;
+	/**
+	 * 徽章图标url
+	 */
+	private String badgeIcon;
+	/**
+	 * 徽章状态 上线:online;下线:offline;
+	 */
+	private String badgeStatus;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java
new file mode 100644
index 0000000000..cc17374704
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java
@@ -0,0 +1,65 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/4 3:51 下午
+ */
+@Data
+public class CertificationDetailResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 6538150132908927308L;
+
+    /**
+     * 姓
+     */
+    private String surname;
+
+    /**
+     * 名
+     */
+    private String name;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 是否认证 yes 认证 no 已认证
+     */
+    private String isCertificated;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 认证图片地址
+     */
+    private String certificationImg;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 审核结果
+     */
+    private String authResult;
+
+    /**
+     * 驳回原因
+     */
+    private String authReason;
+
+    /**
+     * 审核记录ID
+     */
+    private String recordId;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OperAdviceListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OperAdviceListResultDTO.java
new file mode 100644
index 0000000000..82f5aba850
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OperAdviceListResultDTO.java
@@ -0,0 +1,44 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @author: liushaowen
+ * @date: 2020/11/5 17:26
+ */
+@Data
+public class OperAdviceListResultDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 客户名
+     */
+    private String customerName;
+
+    /**
+     * 建议id
+     */
+    private String adviceId;
+
+    /**
+     * 是否回复 0否1是
+     */
+    private String isReply;
+
+    /**
+     * 回复内容
+     */
+    private String adviceContent;
+
+    /**
+     * 手机 空为*
+     */
+    private String phone;
+
+    /**
+     * 建议类型 空为*
+     */
+    private String adviceType;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBadgeListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBadgeListResultDTO.java
new file mode 100644
index 0000000000..19fce3bb3c
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBadgeListResultDTO.java
@@ -0,0 +1,49 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 11:08 上午
+ */
+@Data
+public class UserBadgeListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -6542233940679158922L;
+
+    /**
+     * 徽章ID
+     */
+    private String badgeId;
+
+    /**
+     * 徽章图片地址
+     */
+    private String badgeIcon;
+
+    /**
+     * 徽章是否点亮
+     */
+    private String isOpened;
+
+    private String badgeType;
+
+    @JsonIgnore
+    private String customerId;
+    @JsonIgnore
+    private String badgeName;
+    @JsonIgnore
+    private String fixationBadgeType;
+    @JsonIgnore
+    private Boolean status;
+
+    public UserBadgeListResultDTO() {
+        this.badgeId = "";
+        this.badgeIcon = "";
+        this.isOpened = "0";
+        this.status = false;
+    }
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserOperListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserOperListResultDTO.java
new file mode 100644
index 0000000000..89f3f98aba
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserOperListResultDTO.java
@@ -0,0 +1,67 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 4:20 下午
+ */
+@Data
+public class UserOperListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -6185696177370545937L;
+
+    /**
+     * 徽章ID
+     */
+    private String badgeId;
+
+    /**
+     * 徽章名字
+     */
+    private String badgeName;
+
+    /**
+     * 点亮状态 yes：已点亮，no：未点亮
+     */
+    private String isLighted;
+
+    /**
+     * 是否认证 yes 认证 no 已认证
+     */
+    private String isCertificated;
+
+    /**
+     * 徽章图片地址
+     */
+    private String badgeIcon;
+
+    /**
+     * 是否被驳回  true：已驳回，false：未驳回
+     */
+    private Boolean isReject;
+
+    /**
+     * 徽章类型：党员徽章；party，无：none
+     */
+    private String badgeType;
+
+    @JsonIgnore
+    private String customerId;
+    @JsonIgnore
+    private String isOpened;
+    @JsonIgnore
+    private String auditStatus;
+
+    public UserOperListResultDTO() {
+        this.badgeId = "";
+        this.badgeName = "";
+        this.isLighted = "no";
+        this.isCertificated = "no";
+        this.badgeIcon = "";
+        this.isReject = false;
+    }
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
index e7fda8ad3e..d8e65132a4 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
@@ -328,6 +328,52 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping(value = "epmetuser/staffagencyvisited/getstaffbasicinfo")
     Result<StaffBasicInfo> getStaffBasicInfo(@RequestBody StaffBasicInfoFormDTO formDTO);
 
+    /**
+     * 修改个人信息
+     * @author zhaoqifeng
+     * @date 2020/11/3 10:28
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @PostMapping("/epmetuser/userresiinfo/edituserinfo")
+    Result editUserInfo(@RequestBody EditInfoFormDTO formDTO);
+
+    /**
+     * @Description  查询已经点亮的徽章
+     * @Param userBadgeListFormDTO
+     * @author zxc
+     * @date 2020/11/3 1:33 下午
+     */
+    @PostMapping("/epmetuser/more/badge/badgelist")
+    Result<List<UserBadgeListResultDTO>> selectBadgeList(@RequestBody UserBadgeListFormDTO userBadgeListFormDTO);
+
+    /**
+     * @Description 个人中心-获取徽章可操作列表（点亮，取消，认证）
+     * @Param operListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:28 下午
+     */
+    @PostMapping("/epmetuser/more/badge/badgeoperlist")
+    Result<List<UserOperListResultDTO>> selectOperList(@RequestBody UserOperListFormDTO userOperListFormDTO);
+
+    /**
+     * @Description  徽章认证提交
+     * @Param certificationAddFormDTO
+     * @author zxc
+     * @date 2020/11/4 4:30 下午
+     */
+    @PostMapping("/epmetuser/more/badge/authbadgerecord")
+    Result authBadgeRecord(@RequestBody CertificationAddFormDTO certificationAddFormDTO);
+
+    /**
+     * @Description 个人中心-取消/点亮徽章
+     * @Param openedOrClosedFormDTO
+     * @author zxc
+     * @date 2020/11/5 9:23 上午
+     */
+    @PostMapping("/epmetuser/more/badge/openedorclosed")
+    Result openedOrClosed(@RequestBody OpenedOrClosedFormDTO openedOrClosedFormDTO);
+
     /**
      * 根据staffId查询用户基本信息
      * @author sun
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
index 9e0c973463..14117402a9 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
@@ -225,4 +225,29 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<BasicInfoResultDTO> getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", fromDTO);
     }
+
+    @Override
+    public Result editUserInfo(EditInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "editUserInfo", formDTO);
+    }
+
+    @Override
+    public Result<List<UserBadgeListResultDTO>> selectBadgeList(UserBadgeListFormDTO userBadgeListFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectBadgeList", userBadgeListFormDTO);
+    }
+
+    @Override
+    public Result<List<UserOperListResultDTO>> selectOperList(UserOperListFormDTO userOperListFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectOperList", userOperListFormDTO);
+    }
+
+    @Override
+    public Result authBadgeRecord(CertificationAddFormDTO certificationAddFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "authBadgeRecord", certificationAddFormDTO);
+    }
+
+    @Override
+    public Result openedOrClosed(OpenedOrClosedFormDTO openedOrClosedFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "openedOrClosed", openedOrClosedFormDTO);
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/BadgeMessageConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/BadgeMessageConstant.java
new file mode 100644
index 0000000000..d0dc2a5529
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/BadgeMessageConstant.java
@@ -0,0 +1,23 @@
+package com.epmet.constant;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/9 10:32
+ */
+public interface BadgeMessageConstant {
+	/**
+	 * 消息标题
+	 */
+	String TITLE = "您有一条认证消息";
+
+
+	/**
+	 * 审核通过消息模板
+	 */
+	String APPROVED_MSG = "您好，您提交的%s申请已通过，请查看。";
+	/**
+	 * 审核驳回消息模板
+	 */
+	String REJECTED_MSG = "您好，您提交的%s申请，由于%s，已被驳回。";
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserAdviceConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserAdviceConstant.java
new file mode 100644
index 0000000000..fb82d09fd7
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserAdviceConstant.java
@@ -0,0 +1,7 @@
+package com.epmet.constant;
+
+public interface UserAdviceConstant {
+    String GOV_TYPE_TEXT = "政府业务建议";
+
+    String SOFTWARE_TYPE_TEXT = "软件功能及体验问题";
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRedisKeys.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRedisKeys.java
index f4fffb6975..46f5ad1fa2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRedisKeys.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRedisKeys.java
@@ -23,4 +23,14 @@ public class UserRedisKeys {
     public static String getResiUserKey(String userId){
         return rootPrefix.concat("resi:user:").concat(userId);
     }
+    
+    /**
+     * @Description 用户勋章缓存 epmet:badge:user:[customerId]:[userId]
+     * @param userId
+     * @return epmet:badge:user:[customerId]:[userId]
+     * @author wangc
+     * @date 2020.11.05 13:34
+    */
+    public static String getResiUserBadgeKey(String customerId,String userId){
+        return rootPrefix.concat("badge:user:").concat(customerId).concat(":").concat(userId);}
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java
new file mode 100644
index 0000000000..12042c4fbd
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java
@@ -0,0 +1,153 @@
+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.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.AddBadgeFormDTO;
+import com.epmet.dto.form.BadgeAuditFormDTO;
+import com.epmet.dto.form.BadgeFormDTO;
+import com.epmet.dto.form.EditBadgeFormDTO;
+import com.epmet.dto.result.BadgeAuditRecordResultDTO;
+import com.epmet.dto.result.BadgeAuditingResultDTO;
+import com.epmet.dto.result.BadgeDetailResultDTO;
+import com.epmet.dto.result.BadgeListResultDTO;
+import com.epmet.service.BadgeService;
+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
+ * @dscription
+ * @date 2020/11/3 16:09
+ */
+@RestController
+@RequestMapping("badge")
+public class BadgeController {
+	@Autowired
+	private BadgeService badgeService;
+
+	/**
+	 * 徽章列表
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 14:27
+	 * @param tokenDto
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.BadgeListResultDTO>>
+	 */
+	@PostMapping("list")
+	public Result<List<BadgeListResultDTO>> list(@LoginUser TokenDto tokenDto) {
+		List<BadgeListResultDTO> result = badgeService.getList(tokenDto.getCustomerId());
+		return new Result<List<BadgeListResultDTO>>().ok(result);
+	}
+
+	/**
+	 * 添加徽章
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 14:27
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	@PostMapping("add")
+	public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddBadgeFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO);
+		badgeService.add(tokenDto, formDTO);
+		return new Result();
+	}
+
+	/**
+	 * 徽章详情
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 14:27
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.BadgeDetailResultDTO>
+	 */
+	@PostMapping("detail")
+	public Result<BadgeDetailResultDTO> detail(@LoginUser TokenDto tokenDto, @RequestBody BadgeFormDTO formDTO) {
+		BadgeDetailResultDTO result = badgeService.detail(tokenDto, formDTO);
+		return new Result<BadgeDetailResultDTO>().ok(result);
+	}
+
+	/**
+	 * 修改
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 15:32
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	@PostMapping("edit")
+	public Result edit(@LoginUser TokenDto tokenDto, @RequestBody EditBadgeFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO);
+		badgeService.edit(tokenDto, formDTO);
+		return new Result();
+	}
+
+	/**
+	 * 删除徽章
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 15:34
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	@PostMapping("delete")
+	public Result delete(@LoginUser TokenDto tokenDto, @RequestBody BadgeFormDTO formDTO) {
+		badgeService.deleteBadge(tokenDto, formDTO);
+		return new Result();
+	}
+
+	@PostMapping("test-cache")
+	public Result testCache(){
+		badgeService.testCache();
+		return new Result();
+	}
+	/**
+	 * 待审核列表
+	 * @author zhaoqifeng
+	 * @date 2020/11/5 9:51
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.BadgeAuditingResultDTO>>
+	 */
+	@PostMapping("auditinglist")
+	public Result<List<BadgeAuditingResultDTO>> auditingList(@LoginUser TokenDto tokenDto, @RequestBody BadgeFormDTO formDTO) {
+		List<BadgeAuditingResultDTO> result = badgeService.auditingList(tokenDto, formDTO);
+		return new Result<List<BadgeAuditingResultDTO>>().ok(result);
+	}
+
+	/**
+	 * 审核历史列表
+	 * @author zhaoqifeng
+	 * @date 2020/11/5 10:59
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.BadgeAuditRecordResultDTO>>
+	 */
+	@PostMapping("auditrecord")
+	public Result<List<BadgeAuditRecordResultDTO>> auditRecord(@LoginUser TokenDto tokenDto, @RequestBody BadgeFormDTO formDTO) {
+		List<BadgeAuditRecordResultDTO> result = badgeService.auditRecord(tokenDto, formDTO);
+		return new Result<List<BadgeAuditRecordResultDTO>>().ok(result);
+	}
+
+	/**
+	 * 审核
+	 * @author zhaoqifeng
+	 * @date 2020/11/5 11:09
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	@PostMapping("audit")
+	public Result audit(@LoginUser TokenDto tokenDto, @RequestBody BadgeAuditFormDTO formDTO) {
+		badgeService.audit(tokenDto, formDTO);
+		return new Result();
+	}
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java
new file mode 100644
index 0000000000..b58cc793a3
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java
@@ -0,0 +1,124 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.UserAdviceDTO;
+import com.epmet.dto.form.AdviceListFormDTO;
+import com.epmet.dto.form.ReplyAdviceFormDTO;
+import com.epmet.dto.result.AdviceDetailResultDTO;
+import com.epmet.excel.UserAdviceExcel;
+import com.epmet.service.UserAdviceService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * user_advice
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-06
+ */
+@RestController
+@RequestMapping("useradvice")
+public class UserAdviceController {
+
+    @Autowired
+    private UserAdviceService userAdviceService;
+
+    @Autowired
+    private LoginUserUtil loginUserUtil;
+
+    @GetMapping("page")
+    public Result<PageData<UserAdviceDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<UserAdviceDTO> page = userAdviceService.page(params);
+        return new Result<PageData<UserAdviceDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<UserAdviceDTO> get(@PathVariable("id") String id){
+        UserAdviceDTO data = userAdviceService.get(id);
+        return new Result<UserAdviceDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody UserAdviceDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        userAdviceService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody UserAdviceDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        userAdviceService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        userAdviceService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<UserAdviceDTO> list = userAdviceService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, UserAdviceExcel.class);
+    }
+
+    @PostMapping("replyadvice")
+    public Result replyAdvice(@RequestBody ReplyAdviceFormDTO dto){
+        ValidatorUtils.validateEntity(dto);
+        userAdviceService.replyAdvice(dto,loginUserUtil.getLoginUserId());
+        return new Result();
+    }
+
+    @PostMapping("advicedetail")
+    public Result adviceDetail(String adviceId){
+        if (StringUtils.isBlank(adviceId)){
+            throw new RenException("adviceId不能为空");
+        }
+        return new Result<AdviceDetailResultDTO>().ok(userAdviceService.adviceDetail(adviceId));
+    }
+
+    @PostMapping("advicelist")
+    public Result<PageData<UserAdviceDTO>> adviceList(AdviceListFormDTO dto){
+        ValidatorUtils.validateEntity(dto);
+        PageData<UserAdviceDTO> page = userAdviceService.adviceList(dto);
+        return new Result<PageData<UserAdviceDTO>>().ok(page);
+    }
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceImgController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceImgController.java
new file mode 100644
index 0000000000..2be0871e68
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceImgController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.UserAdviceImgDTO;
+import com.epmet.excel.UserAdviceImgExcel;
+import com.epmet.service.UserAdviceImgService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 用户建议图片
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-04
+ */
+@RestController
+@RequestMapping("useradviceimg")
+public class UserAdviceImgController {
+    
+    @Autowired
+    private UserAdviceImgService userAdviceImgService;
+
+    @GetMapping("page")
+    public Result<PageData<UserAdviceImgDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<UserAdviceImgDTO> page = userAdviceImgService.page(params);
+        return new Result<PageData<UserAdviceImgDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<UserAdviceImgDTO> get(@PathVariable("id") String id){
+        UserAdviceImgDTO data = userAdviceImgService.get(id);
+        return new Result<UserAdviceImgDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody UserAdviceImgDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        userAdviceImgService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody UserAdviceImgDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        userAdviceImgService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        userAdviceImgService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<UserAdviceImgDTO> list = userAdviceImgService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, UserAdviceImgExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java
new file mode 100644
index 0000000000..a901d9202f
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java
@@ -0,0 +1,115 @@
+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.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.AuthFieldResultDTO;
+import com.epmet.dto.result.CertificationDetailResultDTO;
+import com.epmet.dto.result.UserBadgeListResultDTO;
+import com.epmet.dto.result.UserOperListResultDTO;
+import com.epmet.service.UserBadgeService;
+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 zxc
+ * @DateTime 2020/11/3 11:16 上午
+ */
+@RestController
+@RequestMapping("more/badge")
+public class UserBadgeController {
+
+    @Autowired
+    private UserBadgeService userBadgeService;
+
+    /**
+     * @Description  查询已经点亮的徽章
+     * @Param userBadgeListFormDTO
+     * @author zxc
+     * @date 2020/11/3 1:33 下午
+     */
+    @PostMapping("badgelist")
+    public Result<List<UserBadgeListResultDTO>> selectBadgeList(@RequestBody UserBadgeListFormDTO userBadgeListFormDTO){
+        return new Result<List<UserBadgeListResultDTO>>().ok(userBadgeService.selectBadgeList(userBadgeListFormDTO));
+    }
+
+    /**
+     * @Description  个人中心-获取徽章可操作列表（点亮，取消，认证）
+     * @Param userOperListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:42 下午
+     */
+    @PostMapping("badgeoperlist")
+    public Result<List<UserOperListResultDTO>> selectOperList(@RequestBody UserOperListFormDTO userOperListFormDTO){
+        return new Result<List<UserOperListResultDTO>>().ok(userBadgeService.selectOperList(userOperListFormDTO));
+    }
+
+    /**
+     * @Description  个人中心-提交徽章认证
+     * @Param certificationAddFormDTO
+     * @author zxc
+     * @date 2020/11/4 1:36 下午
+     */
+    @PostMapping("authbadgerecord")
+    public Result authBadgeRecord(@RequestBody CertificationAddFormDTO certificationAddFormDTO){
+        return userBadgeService.authBadgeRecord(certificationAddFormDTO);
+    }
+
+    /**
+     * @Description  发送验证码
+     * @Param badgeSendCodeFormDTO
+     * @author zxc
+     * @date 2020/11/4 3:14 下午
+     */
+    @PostMapping("badgesendcode")
+    public Result badgeSendCode(@RequestBody BadgeSendCodeFormDTO badgeSendCodeFormDTO){
+        ValidatorUtils.validateEntity(badgeSendCodeFormDTO, BadgeSendCodeFormDTO.BadgeSendCode.class);
+        userBadgeService.badgeSendCode(badgeSendCodeFormDTO);
+        return new Result();
+    }
+
+    /**
+     * @Description  个人中心-获取徽章认证页面详情
+     * @Param tokenDto
+     * @Param certificationDetailFormDTO
+     * @author zxc
+     * @date 2020/11/4 4:03 下午
+     */
+    @PostMapping("certification/detail")
+    public Result<CertificationDetailResultDTO> certificationDetail(@LoginUser TokenDto tokenDto,@RequestBody CertificationDetailFormDTO certificationDetailFormDTO){
+        ValidatorUtils.validateEntity(certificationDetailFormDTO);
+        return new Result<CertificationDetailResultDTO>().ok(userBadgeService.certificationDetail(tokenDto,certificationDetailFormDTO));
+    }
+
+    /**
+     * @Description  个人中心-查询徽章要显示的认证信息字段
+     * @Param authFieldFormDTO
+     * @author zxc
+     * @date 2020/11/4 5:05 下午
+     */
+    @PostMapping("authfield")
+    public Result<List<AuthFieldResultDTO>> authField(@RequestBody AuthFieldFormDTO authFieldFormDTO){
+        ValidatorUtils.validateEntity(authFieldFormDTO, AuthFieldFormDTO.AuthField.class);
+        return new Result<List<AuthFieldResultDTO>>().ok(userBadgeService.authField(authFieldFormDTO));
+    }
+
+    /**
+     * @Description 个人中心-取消/点亮徽章
+     * @Param openedOrClosedFormDTO
+     * @author zxc
+     * @date 2020/11/4 5:47 下午
+     */
+    @PostMapping("openedorclosed")
+    public Result openedOrClosed(@RequestBody OpenedOrClosedFormDTO openedOrClosedFormDTO){
+        userBadgeService.openedOrClosed(openedOrClosedFormDTO);
+        return new Result();
+    }
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java
index 56a75d64cc..68aea3d580 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java
@@ -26,10 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserResiInfoDTO;
-import com.epmet.dto.form.IssueInitiatorFormDTO;
-import com.epmet.dto.form.UserResiInfoFormDTO;
-import com.epmet.dto.form.UserResiInfoListFormDTO;
-import com.epmet.dto.form.VerificationCodeFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.excel.UserResiInfoExcel;
@@ -163,4 +160,17 @@ public class UserResiInfoController {
         return new Result<IssueInitiatorResultDTO>().ok(userResiInfoService.selectIssueInitiator(formDTO));
     }
 
+    /**
+     * 修改个人信息
+     * @author zhaoqifeng
+     * @date 2020/11/3 10:28
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @PostMapping("edituserinfo")
+    public Result editUserInfo(@RequestBody EditInfoFormDTO formDTO) {
+        userResiInfoService.editUserInfo(formDTO);
+        return new Result();
+    }
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeCertificationConfigDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeCertificationConfigDao.java
new file mode 100644
index 0000000000..e60ac24fc5
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeCertificationConfigDao.java
@@ -0,0 +1,54 @@
+/**
+ * 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.BadgeCertificationConfigEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 徽章认证配置
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-11-03
+ */
+@Mapper
+public interface BadgeCertificationConfigDao extends BaseDao<BadgeCertificationConfigEntity> {
+	/**
+	 * 获取认证信息类型
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 14:42
+	 * @param customerId
+	 * @param badgeId
+	 * @return java.util.List<java.lang.String>
+	 */
+	List<String> getCertificationType(@Param("customerId") String customerId, @Param("badgeId") String badgeId);
+
+	/**
+	 * 删除认证信息
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 14:43
+	 * @param customerId
+	 * @param badgeId
+	 * @return int
+	 */
+	int deleteConfig(@Param("customerId") String customerId, @Param("badgeId") String badgeId);
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java
new file mode 100644
index 0000000000..9e669fd694
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java
@@ -0,0 +1,162 @@
+/**
+ * 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.BadgeDTO;
+import com.epmet.dto.result.*;
+import com.epmet.entity.BadgeEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 徽章
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-11-03
+ */
+@Mapper
+public interface BadgeDao extends BaseDao<BadgeEntity> {
+
+	/**
+	 * 获取徽章列表
+	 *
+	 * @param customerId
+	 * @return java.util.List<com.epmet.dto.result.BadgeListResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/11/3 17:30
+	 */
+	List<BadgeListResultDTO> selectList(@Param("customerId") String customerId);
+
+	/**
+	 * 重名校验
+	 *
+	 * @param customerId
+	 * @param badgeName
+	 * @return java.util.List<com.epmet.dto.result.BadgeListResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 10:40
+	 */
+	List<BadgeListResultDTO> getDuplicateName(@Param("customerId") String customerId, @Param("badgeName") String badgeName);
+
+	/**
+	 * 编辑重名校验
+	 *
+	 * @param customerId
+	 * @param badgeId
+	 * @param badgeName
+	 * @return java.util.List<com.epmet.dto.result.BadgeListResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 15:09
+	 */
+	List<BadgeListResultDTO> getDuplicateNameForEdit(@Param("customerId") String customerId, @Param("badgeId") String badgeId,
+													 @Param("badgeName") String badgeName);
+
+	/**
+	 * 获取徽章详情
+	 *
+	 * @param customerId
+	 * @param badgeId
+	 * @return com.epmet.dto.result.BadgeDetailResultDTO
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 14:30
+	 */
+	BadgeDetailResultDTO selectDetail(@Param("customerId") String customerId, @Param("badgeId") String badgeId);
+
+	/**
+	 * 获取徽章信息
+	 *
+	 * @param customerId
+	 * @param badgeId
+	 * @return com.epmet.entity.BadgeEntity
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 15:16
+	 */
+	BadgeEntity selectBadgeInfo(@Param("customerId") String customerId, @Param("badgeId") String badgeId);
+
+	/**
+	 * 更新徽章信息
+	 *
+	 * @param entity
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 15:38
+	 */
+	void updateBadge(BadgeEntity entity);
+
+	/**
+	 * 删除徽章信息
+	 *
+	 * @param customerId
+	 * @param badgeId
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 15:39
+	 */
+	void deleteBadge(@Param("customerId") String customerId, @Param("badgeId") String badgeId);
+
+
+	/**
+	 * 待审核列表
+	 *
+	 * @param customerId
+	 * @param pageNo
+	 * @param pageSize
+	 * @param gridId
+	 * @return java.util.List<com.epmet.dto.result.BadgeAuditingResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/11/5 10:01
+	 */
+	List<BadgeAuditingResultDTO> selectAuditingList(@Param("customerId") String customerId, @Param("pageNo") Integer pageNo,
+													@Param("pageSize") Integer pageSize, @Param("gridId") String gridId);
+
+	/**
+	 * 审核历史列表
+	 *
+	 * @param customerId
+	 * @param pageNo
+	 * @param pageSize
+	 * @param gridId
+	 * @return java.util.List<com.epmet.dto.result.BadgeAuditRecordResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/11/5 11:01
+	 */
+	List<BadgeAuditRecordResultDTO> selectAuditRecord(@Param("customerId") String customerId, @Param("pageNo") Integer pageNo,
+													  @Param("pageSize") Integer pageSize, @Param("gridId") String gridId);
+
+	/**
+	 * @param customerId
+	 * @return java.util.List<com.epmet.dto.result.UserBadgeListResultDTO>
+	 * @Description 查询客户的徽章
+	 * @author wangc
+	 * @date 2020.11.05 15:50
+	 */
+	List<UserBadgeListResultDTO> selectCustomerBadgePool(@Param("customerId") String customerId);
+
+	/**
+	 * 插入数据
+	 *
+	 * @param entity
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/11/6 14:46
+	 */
+	void insertBadge(BadgeDTO dto);
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ResiUserBadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ResiUserBadgeDao.java
new file mode 100644
index 0000000000..0448b16cee
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ResiUserBadgeDao.java
@@ -0,0 +1,33 @@
+/**
+ * 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.ResiUserBadgeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户徽章关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-11-06
+ */
+@Mapper
+public interface ResiUserBadgeDao extends BaseDao<ResiUserBadgeEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserAdviceDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserAdviceDao.java
new file mode 100644
index 0000000000..e198ef4b82
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserAdviceDao.java
@@ -0,0 +1,37 @@
+/**
+ * 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.UserAdviceEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * user_advice
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-06
+ */
+@Mapper
+public interface UserAdviceDao extends BaseDao<UserAdviceEntity> {
+    void replyAdvice(@Param("adviceId") String adviceId,
+                     @Param("replyContent") String replyContent,
+                     @Param("govContent") String govContent,
+                     @Param("replyUserId") String loginUserId);
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserAdviceImgDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserAdviceImgDao.java
new file mode 100644
index 0000000000..2990eed0d9
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserAdviceImgDao.java
@@ -0,0 +1,33 @@
+/**
+ * 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.UserAdviceImgEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户建议图片
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-04
+ */
+@Mapper
+public interface UserAdviceImgDao extends BaseDao<UserAdviceImgEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeCertificateRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeCertificateRecordDao.java
new file mode 100644
index 0000000000..f7f4dba91c
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeCertificateRecordDao.java
@@ -0,0 +1,33 @@
+/**
+ * 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.UserBadgeCertificateRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户认证徽章记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-11-05
+ */
+@Mapper
+public interface UserBadgeCertificateRecordDao extends BaseDao<UserBadgeCertificateRecordEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java
new file mode 100644
index 0000000000..aae79a6ac3
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java
@@ -0,0 +1,104 @@
+package com.epmet.dao;
+
+import com.epmet.dto.UserBadgeCertificateRecordDTO;
+import com.epmet.dto.form.AuthFieldFormDTO;
+import com.epmet.dto.form.OpenedOrClosedFormDTO;
+import com.epmet.dto.form.UserBadgeListFormDTO;
+import com.epmet.dto.result.AuthFieldResultDTO;
+import com.epmet.dto.result.CertificationDetailResultDTO;
+import com.epmet.dto.result.UserBadgeListResultDTO;
+import com.epmet.dto.result.UserOperListResultDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 1:22 下午
+ */
+@Mapper
+public interface UserBadgeDao {
+
+    /**
+     * @Description  查询已经点亮的徽章
+     * @Param userBadgeListFormDTO
+     * @author zxc
+     * @date 2020/11/3 1:33 下午
+     */
+    List<UserBadgeListResultDTO> selectBadgeList(UserBadgeListFormDTO userBadgeListFormDTO);
+
+    /**
+     * @Description  查询默认徽章和改名后的徽章
+     * @Param userBadgeListFormDTO
+     * @author zxc
+     * @date 2020/11/3 3:11 下午
+     */
+    List<UserBadgeListResultDTO> selectAllBadge(@Param("customerId") String customerId);
+
+    /**
+     * @Description  查询单个徽章信息
+     * @Param customerId
+     * @Param badgeId
+     * @author zxc
+     * @date 2020/11/9 11:17 上午
+     */
+    UserBadgeListResultDTO selectBadgeByBadgeId(@Param("customerId") String customerId,@Param("badgeId") String badgeId);
+
+    /**
+     * @Description  查询徽章认证记录
+     * @Param userId
+     * @author zxc
+     * @date 2020/11/3 5:25 下午
+     */
+    List<UserOperListResultDTO> selectAuthRecord(@Param("userId")String userId);
+
+    /**
+     * @Description  根据UserId查询个人徽章点亮信息
+     * @Param userId
+     * @author zxc
+     * @date 2020/11/4 9:32 上午
+     */
+    List<UserOperListResultDTO> selectBadgeByUserId(@Param("userId")String userId);
+
+    /**
+     * @Description  用户认证徽章记录表插入
+     * @Param userBadgeCertificateRecordDTO
+     * @author zxc
+     * @date 2020/11/4 2:13 下午
+     */
+    void insertUserBadgeCertificateRecord(UserBadgeCertificateRecordDTO userBadgeCertificateRecordDTO);
+
+    /**
+     * @Description  更新认证徽章记录最新
+     * @Param badgeId
+     * @Param userId
+     * @author zxc
+     * @date 2020/11/4 2:16 下午
+     */
+    void updateCertificateRecordIsLast(@Param("badgeId")String badgeId,@Param("userId")String userId);
+
+    /**
+     * @Description  查询单个徽章的认证记录
+     * @Param userId
+     * @Param badgeId
+     * @author zxc
+     * @date 2020/11/4 4:09 下午
+     */
+    CertificationDetailResultDTO selectBadgeAuthRecord(@Param("userId")String userId, @Param("badgeId")String badgeId);
+
+    /**
+     * @Description  个人中心-查询徽章要显示的认证信息字段
+     * @Param authFieldFormDTO
+     * @author zxc
+     * @date 2020/11/4 5:05 下午
+     */
+    List<AuthFieldResultDTO> selectAuthField(AuthFieldFormDTO authFieldFormDTO);
+    /**
+     * @Description  个人中心-取消/点亮徽章
+     * @Param openedOrClosedFormDTO
+     * @author zxc
+     * @date 2020/11/4 6:04 下午
+     */
+    void updateIsOpen(OpenedOrClosedFormDTO openedOrClosedFormDTO);
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java
index fee5c2730b..59d42dfc6e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java
@@ -87,4 +87,13 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	 * @Date 2020/7/22 10:58
 	 **/
 	UserResiInfoDTO selectByUserId(String userId);
+
+	/**
+	 * 根据用户ID更新
+	 * @author zhaoqifeng
+	 * @date 2020/11/3 14:16
+	 * @param entity
+	 * @return void
+	 */
+	void updateByUserId(UserResiInfoEntity entity);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeCertificationConfigEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeCertificationConfigEntity.java
new file mode 100644
index 0000000000..90a6001940
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeCertificationConfigEntity.java
@@ -0,0 +1,56 @@
+/**
+ * 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 2020-11-03
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("badge_certification_config")
+public class BadgeCertificationConfigEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id 默认配置id：default
+     */
+	private String customerId;
+
+    /**
+     * 徽章ID
+     */
+	private String badgeId;
+
+    /**
+     * 认证信息类型 手机号:mobile；全名:fullname;身份证:idcard;认证证件: certificate;认证说明(备注):remark
+     */
+	private String certificationType;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeEntity.java
new file mode 100644
index 0000000000..c6aec0b820
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeEntity.java
@@ -0,0 +1,66 @@
+/**
+ * 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 2020-11-03
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("badge")
+public class BadgeEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id 默认配置id：default
+     */
+	private String customerId;
+
+    /**
+     * 徽章名称
+     */
+	private String badgeName;
+
+    /**
+     * 徽章图标url
+     */
+	private String badgeIcon;
+
+    /**
+     * 固有徽章类型 前端页面跳转标识，党员徽章：party;无：none
+     */
+	private String fixationBadgeType;
+
+    /**
+     * 状态 上线:online;下线:offline;
+     */
+	private String badgeStatus;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ResiUserBadgeEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ResiUserBadgeEntity.java
new file mode 100644
index 0000000000..4087df8fc6
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ResiUserBadgeEntity.java
@@ -0,0 +1,71 @@
+/**
+ * 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 2020-11-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("resi_user_badge")
+public class ResiUserBadgeEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id 默认配置id：default
+     */
+	private String customerId;
+
+    /**
+     * 用户注册网格ID
+     */
+	private String gridId;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 徽章ID
+     */
+	private String badgeId;
+
+    /**
+     * 是否开启(点亮) 1:点亮；0:未点亮
+     */
+	private Integer isOpened;
+
+    /**
+     * 认证(审核)状态 待审核:auditing;审核通过:pass;驳回:rejected;
+     */
+	private String certificationAutidStatus;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java
new file mode 100644
index 0000000000..78c246fa15
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java
@@ -0,0 +1,126 @@
+/**
+ * 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;
+
+/**
+ * user_advice
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("user_advice")
+public class UserAdviceEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 客户名
+     */
+	private String customerName;
+
+    /**
+     * 组织ID
+     */
+	private String agencyId;
+
+    /**
+     * 组织名
+     */
+	private String agencyName;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 网格名
+     */
+	private String gridName;
+
+    /**
+     * userid
+     */
+	private String userId;
+
+    /**
+     * 用户姓名
+     */
+	private String userName;
+
+    /**
+     * 用户注册手机号
+     */
+	private String regPhone;
+
+    /**
+     * 建议描述
+     */
+	private String adviceContent;
+
+    /**
+     * 填写手机号
+     */
+	private String phone;
+
+    /**
+     * 问题分类(gov政府software软件,逗号分隔)
+     */
+	private String adviceType;
+
+    /**
+     * 回复内容
+     */
+	private String replyContent;
+
+    /**
+     * 回复人id
+     */
+	private String replyUserId;
+
+    /**
+     * 回复人姓名
+     */
+	private String replyUserName;
+
+    /**
+     * 回复时间
+     */
+	private Date replyTime;
+
+    /**
+     * 政府存证文字
+     */
+	private String govContent;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceImgEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceImgEntity.java
new file mode 100644
index 0000000000..849b0ba467
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceImgEntity.java
@@ -0,0 +1,56 @@
+/**
+ * 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 qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-04
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("user_advice_img")
+public class UserAdviceImgEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 建议id
+     */
+	private String adviceId;
+
+	/**
+	 * 类型，resi为用户上传,oper为运营上传
+	 */
+	private String type;
+
+    /**
+     * 图片url
+     */
+	private String imgUrl;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java
new file mode 100644
index 0000000000..867ae11bdb
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java
@@ -0,0 +1,116 @@
+/**
+ * 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 2020-11-05
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("user_badge_certificate_record")
+public class UserBadgeCertificateRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id 
+     */
+	private String customerId;
+
+    /**
+     * 用户注册网格ID
+     */
+	private String gridId;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 徽章ID
+     */
+	private String badgeId;
+
+    /**
+     * 姓
+     */
+	private String surname;
+
+    /**
+     * 名
+     */
+	private String name;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 身份证号 网格内去重
+     */
+	private String idNum;
+
+    /**
+     * 认证证件图片
+     */
+	private String certificationImg;
+
+    /**
+     * 认证说明(备注)
+     */
+	private String remaek;
+
+    /**
+     * 审核状态 approved:审核通过，rejected:审核驳回;auditing:审核中
+     */
+	private String auditStatus;
+
+    /**
+     * 审核意见
+     */
+	private String auditRemark;
+
+    /**
+     * 审核人 审核人Id
+     */
+	private String staffId;
+
+    /**
+     * 审核时间
+     */
+	private Date auditTime;
+
+    /**
+     * 是否是最新纪录：yes：最新纪录，no：非最新纪录
+     */
+	private String isLast;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserAdviceExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserAdviceExcel.java
new file mode 100644
index 0000000000..9e93cb6bfc
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserAdviceExcel.java
@@ -0,0 +1,107 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * user_advice
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-06
+ */
+@Data
+public class UserAdviceExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "客户名")
+    private String customerName;
+
+    @Excel(name = "组织ID")
+    private String agencyId;
+
+    @Excel(name = "组织名")
+    private String agencyName;
+
+    @Excel(name = "网格ID")
+    private String gridId;
+
+    @Excel(name = "网格名")
+    private String gridName;
+
+    @Excel(name = "userid")
+    private String userId;
+
+    @Excel(name = "用户姓名")
+    private String userName;
+
+    @Excel(name = "用户注册手机号")
+    private String regPhone;
+
+    @Excel(name = "建议描述")
+    private String adviceContent;
+
+    @Excel(name = "填写手机号")
+    private String phone;
+
+    @Excel(name = "问题分类(gov政府software软件,逗号分隔)")
+    private String adviceType;
+
+    @Excel(name = "回复内容")
+    private String replyContent;
+
+    @Excel(name = "回复人id")
+    private String replyUserId;
+
+    @Excel(name = "回复人姓名")
+    private String replyUserName;
+
+    @Excel(name = "回复时间")
+    private Date replyTime;
+
+    @Excel(name = "政府存证文字")
+    private String govContent;
+
+    @Excel(name = "删除标志")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserAdviceImgExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserAdviceImgExcel.java
new file mode 100644
index 0000000000..f32014927c
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserAdviceImgExcel.java
@@ -0,0 +1,65 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 用户建议图片
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-04
+ */
+@Data
+public class UserAdviceImgExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "建议id")
+    private String adviceId;
+
+    @Excel(name = "类型")
+    private String type;
+
+    @Excel(name = "图片url")
+    private String imgUrl;
+
+    @Excel(name = "删除标志")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/MessageFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/MessageFeignClient.java
index 0b2cb3c0ef..e0be305d7f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/MessageFeignClient.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/MessageFeignClient.java
@@ -2,12 +2,17 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.feign.fallback.MessageFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 @FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class)
 public interface MessageFeignClient {
 
@@ -18,4 +23,13 @@ public interface MessageFeignClient {
     @GetMapping(value = "message/sms/captcha/{mobile}")
     Result sendSmsCaptcha(@PathVariable("mobile") String mobile);
 
+    /**
+     * @param msgList
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author sun
+     * @Description 批量推送消息
+     **/
+    @PostMapping(value = "message/usermessage/saveusermessagelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result saveUserMessageList(List<UserMessageFormDTO> msgList);
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java
index 8af38c06aa..e7dbea7b95 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java
@@ -3,9 +3,12 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.feign.MessageFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 消息服务降级
  */
@@ -17,4 +20,15 @@ public class MessageFeignClientFallback implements MessageFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "sendSmsCaptcha", mobile);
     }
 
+    /**
+     * @param msgList
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author sun
+     * @Description 批量推送消息
+     **/
+    @Override
+    public Result saveUserMessageList(List<UserMessageFormDTO> msgList) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveUserMessageList", msgList);
+    }
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserAdviceImgRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserAdviceImgRedis.java
new file mode 100644
index 0000000000..5c409ddb94
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserAdviceImgRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用户建议图片
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-04
+ */
+@Component
+public class UserAdviceImgRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserAdviceRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserAdviceRedis.java
new file mode 100644
index 0000000000..d35e8427b9
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserAdviceRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * user_advice
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-06
+ */
+@Component
+public class UserAdviceRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java
new file mode 100644
index 0000000000..0b57fcbb9f
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java
@@ -0,0 +1,150 @@
+package com.epmet.redis;
+
+
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.BadgeConstant;
+import com.epmet.constant.UserRedisKeys;
+import com.epmet.dao.BadgeDao;
+import com.epmet.dto.form.UserBadgeUnitFormDTO;
+import com.epmet.dto.result.UserBadgeListResultDTO;
+import com.epmet.service.UserBadgeService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Optional;
+
+import static com.epmet.commons.tools.redis.RedisUtils.MINUTE_THIRTY_EXPIRE;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 2:21 下午
+ */
+@Component
+@Slf4j
+public class UserBadgeRedis {
+
+    @Autowired
+    private RedisUtils redisUtils;
+    @Autowired
+    private BadgeDao badgeDao;
+    @Autowired
+    private UserBadgeService badgeService;
+
+    /**
+     * @Description 获取客户徽章信息
+     * @Param customerId
+     * @author zxc
+     * @date 2020/11/3 2:50 下午
+     */
+    public Object getCustomerBadge(String customerId) {
+        Object userBadge = redisUtils.hGet(BadgeConstant.BADGE_KEY + customerId, BadgeConstant.BADGE);
+        return userBadge;
+    }
+
+    /**
+     * @Description 存放客户徽章信息
+     * @Param userBadge
+     * @Param customerId
+     * @author zxc
+     * @date 2020/11/3 2:51 下午
+     */
+    public void setCustomerBadge(List<UserBadgeListResultDTO> userBadge, String customerId) {
+        redisUtils.hSet(BadgeConstant.BADGE_KEY + customerId, BadgeConstant.BADGE, JSON.toJSON(userBadge).toString(), -1);
+    }
+
+    /**
+     * @Description 删除客户徽章信息
+     * @Param customerId
+     * @author zxc
+     * @date 2020/11/5 3:06 下午
+     */
+    public void delCustomerBadge(String customerId) {
+        redisUtils.hDel(BadgeConstant.BADGE_KEY + customerId, BadgeConstant.BADGE);
+    }
+
+    /**
+     * @Description 存放徽章审核 手机验证码
+     * @Param mobile
+     * @author zxc
+     * @date 2020/11/5 10:30 上午
+     */
+    public void saveBadgeSmsCode(String mobile, String smsCode) {
+        String smsCodeKey = BadgeConstant.SMS_CODE_KEY + mobile;
+        redisUtils.set(smsCodeKey, smsCode, MINUTE_THIRTY_EXPIRE);
+    }
+
+    /**
+     * @Description 获取徽章审核 手机验证码
+     * @Param mobile
+     * @author zxc
+     * @date 2020/11/5 10:30 上午
+     */
+    public String getBadgeSmsCode(String mobile) {
+        String smsCodeKey = BadgeConstant.SMS_CODE_KEY + mobile;
+        String smsCode = (String) redisUtils.get(smsCodeKey);
+        return smsCode;
+    }
+
+    /**
+     * @param userId
+     * @return java.util.List<com.epmet.dto.form.UserBadgeUnitFormDTO>
+     * @Description 获取用户的全部勋章信息(点亮的 、 排序从前到后)
+     * @author wangc
+     * @date 2020.11.05 13:26
+     */
+    public List<UserBadgeUnitFormDTO> obtainUserBadge2List(String userId,String customerId) {
+        //TODO  补偿
+        return redisUtils.lrange(UserRedisKeys.getResiUserBadgeKey(customerId,userId), NumConstant.ZERO, NumConstant.ONE_NEG, UserBadgeUnitFormDTO.class);
+    }
+
+    /**
+     * 用户点亮或取消徽章
+     * @param
+     * @return int
+     * @Description 入栈时使用lpush 出栈时使用lrem
+     * @author wangc
+     * @date 2020.11.05 13:37
+     */
+    public long pushOrRemoveUserBadge4List(String userId, String badgeId, String customerId) {
+        List<UserBadgeUnitFormDTO> orient = obtainUserBadge2List(userId,customerId);
+        UserBadgeUnitFormDTO unit = null;
+
+        if (!CollectionUtils.isEmpty(orient)) {
+            Optional<UserBadgeUnitFormDTO> opt = orient.stream().filter(badge -> StringUtils.equals(badgeId, badge.getBadgeId())).findFirst();
+            if (opt.isPresent()) {
+                unit = opt.get();
+                return redisUtils.lrem(UserRedisKeys.getResiUserBadgeKey(customerId, userId), NumConstant.ONE, unit);
+            }
+        }
+
+            //徽章池
+            Object badgeObj = getCustomerBadge(customerId);
+
+            List<UserBadgeListResultDTO> badgePool =
+                    null == badgeObj ? badgeDao.selectCustomerBadgePool(customerId) : JSON.parseArray(badgeObj.toString(), UserBadgeListResultDTO.class);
+
+            if (CollectionUtils.isEmpty(badgePool)) {
+                log.error("com.epmet.redis.UserBadgeRedis.pushOrRemoveUserBadge4List，缓存中客户{}下的徽章池为空", customerId);
+                return NumConstant.ZERO;
+            }
+
+            if (null == unit) {
+                Optional<UserBadgeListResultDTO> poolOpt =
+                        badgePool.stream().filter(badge -> StringUtils.equals(badge.getBadgeId(), badgeId)).findFirst();
+                if (poolOpt.isPresent()) unit = ConvertUtils.sourceToTarget(poolOpt.get(), UserBadgeUnitFormDTO.class);
+                else return NumConstant.ZERO;
+            }
+            redisUtils.leftPush(UserRedisKeys.getResiUserBadgeKey(customerId, userId), unit);
+            return NumConstant.ONE;
+        }
+
+    }
+
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeCertificationConfigService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeCertificationConfigService.java
new file mode 100644
index 0000000000..5c14ca740a
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeCertificationConfigService.java
@@ -0,0 +1,127 @@
+/**
+ * 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.BadgeCertificationConfigDTO;
+import com.epmet.entity.BadgeCertificationConfigEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 徽章认证配置
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-11-03
+ */
+public interface BadgeCertificationConfigService extends BaseService<BadgeCertificationConfigEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<BadgeCertificationConfigDTO>
+     * @author generator
+     * @date 2020-11-03
+     */
+    PageData<BadgeCertificationConfigDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<BadgeCertificationConfigDTO>
+     * @author generator
+     * @date 2020-11-03
+     */
+    List<BadgeCertificationConfigDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return BadgeCertificationConfigDTO
+     * @author generator
+     * @date 2020-11-03
+     */
+    BadgeCertificationConfigDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-11-03
+     */
+    void save(BadgeCertificationConfigDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-11-03
+     */
+    void update(BadgeCertificationConfigDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-11-03
+     */
+    void delete(String[] ids);
+    
+    /**
+     * 获取认证信息类型
+     * @author zhaoqifeng
+     * @date 2020/11/4 14:39
+     * @param customerId
+     * @param badgeId
+     * @return java.util.List<java.lang.String>
+     */
+    List<String> getCertificationType(String customerId, String badgeId);
+
+    /**
+     * 保存认证信息配置
+     * @author zhaoqifeng
+     * @date 2020/11/4 15:29
+     * @param customerId
+     * @param badgeId
+     * @param list
+     * @return void
+     */
+    void saveConfig(String customerId, String badgeId, List<BadgeCertificationConfigEntity> list);
+
+    /**
+     * 删除配置
+     * @author zhaoqifeng
+     * @date 2020/11/4 15:41
+     * @param customerId
+     * @param badgeId
+     * @return void
+     */
+    void deleteConfig(String customerId, String badgeId);
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java
new file mode 100644
index 0000000000..9b13682b6f
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java
@@ -0,0 +1,185 @@
+/**
+ * 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.BadgeDTO;
+import com.epmet.dto.form.AddBadgeFormDTO;
+import com.epmet.dto.form.BadgeAuditFormDTO;
+import com.epmet.dto.form.BadgeFormDTO;
+import com.epmet.dto.form.EditBadgeFormDTO;
+import com.epmet.dto.result.BadgeAuditRecordResultDTO;
+import com.epmet.dto.result.BadgeAuditingResultDTO;
+import com.epmet.dto.result.BadgeDetailResultDTO;
+import com.epmet.dto.result.BadgeListResultDTO;
+import com.epmet.entity.BadgeEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 徽章
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-11-03
+ */
+public interface BadgeService extends BaseService<BadgeEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<BadgeDTO>
+     * @author generator
+     * @date 2020-11-03
+     */
+    PageData<BadgeDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<BadgeDTO>
+     * @author generator
+     * @date 2020-11-03
+     */
+    List<BadgeDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return BadgeDTO
+     * @author generator
+     * @date 2020-11-03
+     */
+    BadgeDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-11-03
+     */
+    void save(BadgeDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-11-03
+     */
+    void update(BadgeDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-11-03
+     */
+    void delete(String[] ids);
+
+    /**
+     * 获取徽章列表
+     * @author zhaoqifeng
+     * @date 2020/11/3 17:04
+     * @param customerId
+     * @return java.util.List<com.epmet.dto.result.BadgeListResultDTO>
+     */
+    List<BadgeListResultDTO> getList(String customerId);
+
+    /**
+     * 添加徽章
+     * @author zhaoqifeng
+     * @date 2020/11/4 10:09
+     * @param tokenDto
+     * @param formDTO
+     * @return void
+     */
+    void add(TokenDto tokenDto, AddBadgeFormDTO formDTO);
+
+    /**
+     * 徽章详情
+     * @author zhaoqifeng
+     * @date 2020/11/4 14:25
+     * @param tokenDto
+     * @param formDTO
+     * @return com.epmet.dto.result.BadgeDetailResultDTO
+     */
+    BadgeDetailResultDTO detail(TokenDto tokenDto, BadgeFormDTO formDTO);
+
+    /**
+     * 编辑徽章
+     * @author zhaoqifeng
+     * @date 2020/11/4 14:28
+     * @param tokenDto
+     * @param formDTO
+     * @return void
+     */
+    void edit(TokenDto tokenDto, EditBadgeFormDTO formDTO);
+
+    /**
+     * 删除徽章
+     * @author zhaoqifeng
+     * @date 2020/11/4 15:34
+     * @param tokenDto
+     * @param formDTO
+     * @return void
+     */
+    void deleteBadge(TokenDto tokenDto, BadgeFormDTO formDTO);
+
+    /**
+     * 待审核列表
+     * @author zhaoqifeng
+     * @date 2020/11/5 9:50
+     * @param tokenDto
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.result.BadgeAuditingResultDTO>
+     */
+    List<BadgeAuditingResultDTO> auditingList(TokenDto tokenDto, BadgeFormDTO formDTO);
+
+    /**
+     * 审核历史列表
+     * @author zhaoqifeng
+     * @date 2020/11/5 10:59
+     * @param tokenDto
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.result.BadgeAuditRecordResultDTO>
+     */
+    List<BadgeAuditRecordResultDTO> auditRecord(TokenDto tokenDto, BadgeFormDTO formDTO);
+
+    /**
+     * 审核
+     * @author zhaoqifeng
+     * @date 2020/11/5 11:08
+     * @param tokenDto
+     * @param formDTO
+     * @return void
+     */
+    void audit(TokenDto tokenDto, BadgeAuditFormDTO formDTO);
+
+    void testCache();
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ResiUserBadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ResiUserBadgeService.java
new file mode 100644
index 0000000000..b858776d51
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ResiUserBadgeService.java
@@ -0,0 +1,95 @@
+/**
+ * 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.ResiUserBadgeDTO;
+import com.epmet.entity.ResiUserBadgeEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户徽章关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-11-06
+ */
+public interface ResiUserBadgeService extends BaseService<ResiUserBadgeEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ResiUserBadgeDTO>
+     * @author generator
+     * @date 2020-11-06
+     */
+    PageData<ResiUserBadgeDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ResiUserBadgeDTO>
+     * @author generator
+     * @date 2020-11-06
+     */
+    List<ResiUserBadgeDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ResiUserBadgeDTO
+     * @author generator
+     * @date 2020-11-06
+     */
+    ResiUserBadgeDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-11-06
+     */
+    void save(ResiUserBadgeDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-11-06
+     */
+    void update(ResiUserBadgeDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-11-06
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceImgService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceImgService.java
new file mode 100644
index 0000000000..86ed81cb83
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceImgService.java
@@ -0,0 +1,104 @@
+/**
+ * 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.UserAdviceImgDTO;
+import com.epmet.entity.UserAdviceImgEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户建议图片
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-04
+ */
+public interface UserAdviceImgService extends BaseService<UserAdviceImgEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<UserAdviceImgDTO>
+     * @author generator
+     * @date 2020-11-04
+     */
+    PageData<UserAdviceImgDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<UserAdviceImgDTO>
+     * @author generator
+     * @date 2020-11-04
+     */
+    List<UserAdviceImgDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return UserAdviceImgDTO
+     * @author generator
+     * @date 2020-11-04
+     */
+    UserAdviceImgDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-11-04
+     */
+    void save(UserAdviceImgDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-11-04
+     */
+    void update(UserAdviceImgDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-11-04
+     */
+    void delete(String[] ids);
+
+    /**
+     * @Description 根据adviceId获取关联的图片
+     * @param adviceId
+     * @return void
+     * @Author liushaowen
+     * @Date 2020/11/9 9:59
+     */
+    List<UserAdviceImgEntity> getImgsByAdviceId(String adviceId);
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java
new file mode 100644
index 0000000000..8e018df061
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java
@@ -0,0 +1,126 @@
+/**
+ * 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.UserAdviceDTO;
+import com.epmet.dto.form.AdviceListFormDTO;
+import com.epmet.dto.form.ReplyAdviceFormDTO;
+import com.epmet.dto.result.AdviceDetailResultDTO;
+import com.epmet.entity.UserAdviceEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * user_advice
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-06
+ */
+public interface UserAdviceService extends BaseService<UserAdviceEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<UserAdviceDTO>
+     * @author generator
+     * @date 2020-11-06
+     */
+    PageData<UserAdviceDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<UserAdviceDTO>
+     * @author generator
+     * @date 2020-11-06
+     */
+    List<UserAdviceDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return UserAdviceDTO
+     * @author generator
+     * @date 2020-11-06
+     */
+    UserAdviceDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-11-06
+     */
+    void save(UserAdviceDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-11-06
+     */
+    void update(UserAdviceDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-11-06
+     */
+    void delete(String[] ids);
+
+    /**
+     * @Description 回复建议
+     * @param dto
+     * @param loginUserId
+     * @return void
+     * @Author liushaowen
+     * @Date 2020/11/6 16:44
+     */
+    void replyAdvice(ReplyAdviceFormDTO dto, String loginUserId);
+
+    /**
+     * @Description 建议详情
+     * @param adviceId
+     * @return com.epmet.dto.result.AdviceDetailResultDTO
+     * @Author liushaowen
+     * @Date 2020/11/6 17:19
+     */
+    AdviceDetailResultDTO adviceDetail(String adviceId);
+
+    /**
+     * @Description 查询建议列表
+     * @param dto
+     * @return com.epmet.commons.tools.page.PageData<com.epmet.dto.UserAdviceDTO>
+     * @Author liushaowen
+     * @Date 2020/11/9 10:41
+     */
+    PageData<UserAdviceDTO> adviceList(AdviceListFormDTO dto);
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeCertificateRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeCertificateRecordService.java
new file mode 100644
index 0000000000..154c8685db
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeCertificateRecordService.java
@@ -0,0 +1,95 @@
+/**
+ * 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.UserBadgeCertificateRecordDTO;
+import com.epmet.entity.UserBadgeCertificateRecordEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户认证徽章记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-11-05
+ */
+public interface UserBadgeCertificateRecordService extends BaseService<UserBadgeCertificateRecordEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<UserBadgeCertificateRecordDTO>
+     * @author generator
+     * @date 2020-11-05
+     */
+    PageData<UserBadgeCertificateRecordDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<UserBadgeCertificateRecordDTO>
+     * @author generator
+     * @date 2020-11-05
+     */
+    List<UserBadgeCertificateRecordDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return UserBadgeCertificateRecordDTO
+     * @author generator
+     * @date 2020-11-05
+     */
+    UserBadgeCertificateRecordDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-11-05
+     */
+    void save(UserBadgeCertificateRecordDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-11-05
+     */
+    void update(UserBadgeCertificateRecordDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-11-05
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeService.java
new file mode 100644
index 0000000000..81213550b9
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeService.java
@@ -0,0 +1,84 @@
+package com.epmet.service;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.AuthFieldResultDTO;
+import com.epmet.dto.result.CertificationDetailResultDTO;
+import com.epmet.dto.result.UserBadgeListResultDTO;
+import com.epmet.dto.result.UserOperListResultDTO;
+
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 11:18 上午
+ */
+public interface UserBadgeService {
+
+    /**
+     * @Description  查询已经点亮的徽章
+     * @Param userBadgeListFormDTO
+     * @author zxc
+     * @date 2020/11/3 1:33 下午
+     */
+    List<UserBadgeListResultDTO> selectBadgeList(UserBadgeListFormDTO userBadgeListFormDTO);
+
+    /**
+     * @Description  个人中心-获取徽章可操作列表（点亮，取消，认证）
+     * @Param userOperListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:42 下午
+     */
+    List<UserOperListResultDTO> selectOperList(UserOperListFormDTO userOperListFormDTO);
+
+    /**
+     * @Description  个人中心-提交徽章认证
+     * @Param certificationAddFormDTO
+     * @author zxc
+     * @date 2020/11/4 1:36 下午
+     */
+    Result authBadgeRecord(CertificationAddFormDTO certificationAddFormDTO);
+
+    /**
+     * @Description  发送验证码
+     * @Param badgeSendCodeFormDTO
+     * @author zxc
+     * @date 2020/11/4 3:14 下午
+     */
+    void badgeSendCode(BadgeSendCodeFormDTO badgeSendCodeFormDTO);
+
+    /**
+     * @Description  个人中心-获取徽章认证页面详情
+     * @Param tokenDto
+     * @Param certificationDetailFormDTO
+     * @author zxc
+     * @date 2020/11/4 4:03 下午
+     */
+    CertificationDetailResultDTO certificationDetail(TokenDto tokenDto, CertificationDetailFormDTO certificationDetailFormDTO);
+
+    /**
+     * @Description  个人中心-查询徽章要显示的认证信息字段
+     * @Param authFieldFormDTO
+     * @author zxc
+     * @date 2020/11/4 5:05 下午
+     */
+    List<AuthFieldResultDTO> authField(AuthFieldFormDTO authFieldFormDTO);
+
+    /**
+     * @Description 个人中心-取消/点亮徽章
+     * @Param openedOrClosedFormDTO
+     * @author zxc
+     * @date 2020/11/4 5:47 下午
+     */
+    void openedOrClosed(OpenedOrClosedFormDTO openedOrClosedFormDTO);
+
+    /**
+     * @Description  客户徽章缓存初始化
+     * @Param customerId
+     * @author zxc
+     * @date 2020/11/5 3:12 下午
+     */
+    void reloadCustomerBadge(String customerId);
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java
index d01c706fd5..11fff3816b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java
@@ -21,10 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
-import com.epmet.dto.form.IssueInitiatorFormDTO;
-import com.epmet.dto.form.UserResiInfoFormDTO;
-import com.epmet.dto.form.UserResiInfoListFormDTO;
-import com.epmet.dto.form.VerificationCodeFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.UserResiInfoEntity;
@@ -151,4 +148,13 @@ public interface UserResiInfoService extends BaseService<UserResiInfoEntity> {
 	 * @date 2020/5/11 10:59
 	 */
 	IssueInitiatorResultDTO selectIssueInitiator(IssueInitiatorFormDTO formDTO);
+
+	/**
+	 * 修改个人信息
+	 * @author zhaoqifeng
+	 * @date 2020/11/3 10:29
+	 * @param formDTO
+	 * @return void
+	 */
+	void editUserInfo(EditInfoFormDTO formDTO);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeCertificationConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeCertificationConfigServiceImpl.java
new file mode 100644
index 0000000000..2af4587368
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeCertificationConfigServiceImpl.java
@@ -0,0 +1,149 @@
+/**
+ * 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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.BadgeCertificationConfigDao;
+import com.epmet.dto.BadgeCertificationConfigDTO;
+import com.epmet.entity.BadgeCertificationConfigEntity;
+import com.epmet.service.BadgeCertificationConfigService;
+import org.apache.commons.collections4.CollectionUtils;
+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.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 徽章认证配置
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-11-03
+ */
+@Service
+public class BadgeCertificationConfigServiceImpl extends BaseServiceImpl<BadgeCertificationConfigDao, BadgeCertificationConfigEntity> implements BadgeCertificationConfigService {
+
+
+    @Override
+    public PageData<BadgeCertificationConfigDTO> page(Map<String, Object> params) {
+        IPage<BadgeCertificationConfigEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, BadgeCertificationConfigDTO.class);
+    }
+
+    @Override
+    public List<BadgeCertificationConfigDTO> list(Map<String, Object> params) {
+        List<BadgeCertificationConfigEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, BadgeCertificationConfigDTO.class);
+    }
+
+    private QueryWrapper<BadgeCertificationConfigEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<BadgeCertificationConfigEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public BadgeCertificationConfigDTO get(String id) {
+        BadgeCertificationConfigEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, BadgeCertificationConfigDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(BadgeCertificationConfigDTO dto) {
+        BadgeCertificationConfigEntity entity = ConvertUtils.sourceToTarget(dto, BadgeCertificationConfigEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(BadgeCertificationConfigDTO dto) {
+        BadgeCertificationConfigEntity entity = ConvertUtils.sourceToTarget(dto, BadgeCertificationConfigEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * 获取认证信息类型
+     *
+     * @param customerId
+     * @param badgeId
+     * @return java.util.List<java.lang.String>
+     * @author zhaoqifeng
+     * @date 2020/11/4 14:39
+     */
+    @Override
+    public List<String> getCertificationType(String customerId, String badgeId) {
+        List<String> list = baseDao.getCertificationType(customerId, badgeId);
+        if (CollectionUtils.isEmpty(list)) {
+            list = baseDao.getCertificationType("default", badgeId);
+        }
+        return list;
+    }
+
+    /**
+     * 保存认证信息配置
+     *
+     * @param list
+     * @return void
+     * @author zhaoqifeng
+     * @date 2020/11/4 15:28
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveConfig(String customerId, String badgeId, List<BadgeCertificationConfigEntity> list) {
+        baseDao.deleteConfig(customerId, badgeId);
+        insertBatch(list);
+    }
+
+    /**
+     * 删除配置
+     *
+     * @param customerId
+     * @param badgeId
+     * @return void
+     * @author zhaoqifeng
+     * @date 2020/11/4 15:41
+     */
+    @Override
+    public void deleteConfig(String customerId, String badgeId) {
+        baseDao.deleteConfig(customerId, badgeId);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java
new file mode 100644
index 0000000000..b66faf5095
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java
@@ -0,0 +1,383 @@
+/**
+ * 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.Constant;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+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.constant.BadgeConstant;
+import com.epmet.constant.BadgeMessageConstant;
+import com.epmet.constant.UserConstant;
+import com.epmet.dao.BadgeDao;
+import com.epmet.dto.BadgeDTO;
+import com.epmet.dto.ResiUserBadgeDTO;
+import com.epmet.dto.UserBadgeCertificateRecordDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.BadgeAuditRecordResultDTO;
+import com.epmet.dto.result.BadgeAuditingResultDTO;
+import com.epmet.dto.result.BadgeDetailResultDTO;
+import com.epmet.dto.result.BadgeListResultDTO;
+import com.epmet.entity.BadgeCertificationConfigEntity;
+import com.epmet.entity.BadgeEntity;
+import com.epmet.feign.MessageFeignClient;
+import com.epmet.redis.UserBadgeRedis;
+import com.epmet.service.*;
+import org.apache.commons.collections4.CollectionUtils;
+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.util.*;
+
+/**
+ * 徽章
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-11-03
+ */
+@Service
+public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> implements BadgeService {
+
+    @Autowired
+    private BadgeCertificationConfigService badgeCertificationConfigService;
+    @Autowired
+    private UserBadgeCertificateRecordService userBadgeCertificateRecordService;
+    @Autowired
+    private UserBadgeRedis badgeRedis;
+    @Autowired
+    private UserBadgeService userBadgeService;
+    @Autowired
+    private ResiUserBadgeService resiUserBadgeService;
+    @Autowired
+    private MessageFeignClient messageFeignClient;
+
+
+    @Override
+    public PageData<BadgeDTO> page(Map<String, Object> params) {
+        IPage<BadgeEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, BadgeDTO.class);
+    }
+
+    @Override
+    public List<BadgeDTO> list(Map<String, Object> params) {
+        List<BadgeEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, BadgeDTO.class);
+    }
+
+    private QueryWrapper<BadgeEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<BadgeEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public BadgeDTO get(String id) {
+        BadgeEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, BadgeDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(BadgeDTO dto) {
+        BadgeEntity entity = ConvertUtils.sourceToTarget(dto, BadgeEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(BadgeDTO dto) {
+        BadgeEntity entity = ConvertUtils.sourceToTarget(dto, BadgeEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * 获取徽章列表
+     *
+     * @param customerId 客户ID
+     * @return java.util.List<com.epmet.dto.result.BadgeListResultDTO>
+     * @author zhaoqifeng
+     * @date 2020/11/3 17:04
+     */
+    @Override
+    public List<BadgeListResultDTO> getList(String customerId) {
+        return baseDao.selectList(customerId);
+    }
+
+    /**
+     * 添加徽章
+     *
+     * @param tokenDto token
+     * @param formDTO 入参
+     * @return void
+     * @author zhaoqifeng
+     * @date 2020/11/4 10:09
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void add(TokenDto tokenDto, AddBadgeFormDTO formDTO) {
+        //重名校验
+        List<BadgeListResultDTO> list = baseDao.getDuplicateName(tokenDto.getCustomerId(), formDTO.getBadgeName());
+        if (CollectionUtils.isNotEmpty(list)) {
+            throw new RenException(EpmetErrorCode.DUPLICATE_BADGE_NAME.getCode());
+        }
+        BadgeEntity entity = ConvertUtils.sourceToTarget(formDTO, BadgeEntity.class);
+        entity.setCustomerId(tokenDto.getCustomerId());
+        entity.setFixationBadgeType(BadgeConstant.NONE);
+        insert(entity);
+        //保存徽章认证配置
+        List<BadgeCertificationConfigEntity> badgeList = new ArrayList<>();
+        formDTO.getCertificationTypes().forEach(item -> {
+            BadgeCertificationConfigEntity badge = new BadgeCertificationConfigEntity();
+            badge.setBadgeId(entity.getId());
+            badge.setCertificationType(item);
+            badge.setCustomerId(tokenDto.getCustomerId());
+            badgeList.add(badge);
+        });
+        badgeCertificationConfigService.insertBatch(badgeList);
+        //更新Redis
+        if (BadgeConstant.ONLINE.equals(formDTO.getBadgeStatus())) {
+            userBadgeService.reloadCustomerBadge(tokenDto.getCustomerId());
+        }
+    }
+
+    /**
+     * 徽章详情
+     *
+     * @param tokenDto token
+     * @param formDTO 入参
+     * @return com.epmet.dto.result.BadgeDetailResultDTO
+     * @author zhaoqifeng
+     * @date 2020/11/4 14:25
+     */
+    @Override
+    public BadgeDetailResultDTO detail(TokenDto tokenDto, BadgeFormDTO formDTO) {
+        BadgeDetailResultDTO result = baseDao.selectDetail(tokenDto.getCustomerId(), formDTO.getBadgeId());
+        List<String> types = badgeCertificationConfigService.getCertificationType(tokenDto.getCustomerId(), formDTO.getBadgeId());
+        result.setCertificationTypes(types);
+        return result;
+    }
+
+    /**
+     * 编辑徽章
+     *
+     * @param tokenDto token
+     * @param formDTO 入参
+     * @return void
+     * @author zhaoqifeng
+     * @date 2020/11/4 14:28
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void edit(TokenDto tokenDto, EditBadgeFormDTO formDTO) {
+        //重名校验
+        List<BadgeListResultDTO> list = baseDao.getDuplicateNameForEdit(tokenDto.getCustomerId(), formDTO.getBadgeId(), formDTO.getBadgeName());
+        if (CollectionUtils.isNotEmpty(list)) {
+            throw new RenException(EpmetErrorCode.DUPLICATE_BADGE_NAME.getCode());
+        }
+
+        BadgeEntity badgeEntity = baseDao.selectBadgeInfo(tokenDto.getCustomerId(), formDTO.getBadgeId());
+        if (null == badgeEntity) {
+            badgeEntity = baseDao.selectBadgeInfo("default", formDTO.getBadgeId());
+            badgeEntity.setCustomerId(tokenDto.getCustomerId());
+            badgeEntity.setBadgeName(formDTO.getBadgeName());
+            badgeEntity.setBadgeIcon(formDTO.getBadgeIcon());
+            badgeEntity.setBadgeStatus(formDTO.getBadgeStatus());
+            baseDao.insert(badgeEntity);
+        } else {
+            badgeEntity.setBadgeName(formDTO.getBadgeName());
+            badgeEntity.setBadgeIcon(formDTO.getBadgeIcon());
+            badgeEntity.setBadgeStatus(formDTO.getBadgeStatus());
+            baseDao.updateBadge(badgeEntity);
+        }
+        //保存徽章认证配置
+        List<BadgeCertificationConfigEntity> badgeList = new ArrayList<>();
+        formDTO.getCertificationTypes().forEach(item -> {
+            BadgeCertificationConfigEntity badge = new BadgeCertificationConfigEntity();
+            badge.setBadgeId(formDTO.getBadgeId());
+            badge.setCertificationType(item);
+            badge.setCustomerId(tokenDto.getCustomerId());
+            badgeList.add(badge);
+        });
+        badgeCertificationConfigService.saveConfig(tokenDto.getCustomerId(), formDTO.getBadgeId(), badgeList);
+        //更新Redis
+        userBadgeService.reloadCustomerBadge(tokenDto.getCustomerId());
+    }
+
+    /**
+     * 删除徽章
+     *
+     * @param tokenDto token
+     * @param formDTO 入参
+     * @return void
+     * @author zhaoqifeng
+     * @date 2020/11/4 15:34
+     */
+    @Override
+    public void deleteBadge(TokenDto tokenDto, BadgeFormDTO formDTO) {
+        BadgeEntity badgeEntity = baseDao.selectBadgeInfo(tokenDto.getCustomerId(), formDTO.getBadgeId());
+        if (null == badgeEntity) {
+            badgeEntity = baseDao.selectBadgeInfo("default", formDTO.getBadgeId());
+            if (BadgeConstant.PARTY.equals(badgeEntity.getFixationBadgeType())) {
+                throw new RenException(EpmetErrorCode.DUPLICATE_PARTY_BADGE_NAME.getCode());
+            }
+            BadgeDTO badgeDTO = ConvertUtils.sourceToTarget(badgeEntity, BadgeDTO.class);
+            badgeDTO.setCustomerId(tokenDto.getCustomerId());
+            badgeDTO.setDelFlag(NumConstant.ONE_STR);
+            badgeDTO.setCreatedBy(tokenDto.getUserId());
+            badgeDTO.setCreatedTime(new Date());
+            badgeDTO.setUpdatedBy(tokenDto.getUserId());
+            badgeDTO.setUpdatedTime(new Date());
+            baseDao.insertBadge(badgeDTO);
+        } else {
+            if (BadgeConstant.PARTY.equals(badgeEntity.getFixationBadgeType())) {
+                throw new RenException(EpmetErrorCode.DUPLICATE_PARTY_BADGE_NAME.getCode());
+            }
+            baseDao.deleteBadge(tokenDto.getCustomerId(), formDTO.getBadgeId());
+        }
+        badgeCertificationConfigService.deleteConfig(tokenDto.getCustomerId(), formDTO.getBadgeId());
+        //更新Redis
+        userBadgeService.reloadCustomerBadge(tokenDto.getCustomerId());
+    }
+
+    /**
+     * 待审核列表
+     *
+     * @param tokenDto token
+     * @param formDTO 入参
+     * @return java.util.List<com.epmet.dto.result.BadgeAuditingResultDTO>
+     * @author zhaoqifeng
+     * @date 2020/11/5 9:50
+     */
+    @Override
+    public List<BadgeAuditingResultDTO> auditingList(TokenDto tokenDto, BadgeFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        List<BadgeAuditingResultDTO> list = baseDao.selectAuditingList(tokenDto.getCustomerId(), pageIndex, formDTO.getPageSize(), formDTO.getGridId());
+        list.forEach(item -> item.setCreateTime(item.getCreateTime()/NumConstant.SIXTY));
+        return list;
+    }
+
+    /**
+     * 审核历史列表
+     *
+     * @param tokenDto token
+     * @param formDTO 入参
+     * @return java.util.List<com.epmet.dto.result.BadgeAuditRecordResultDTO>
+     * @author zhaoqifeng
+     * @date 2020/11/5 10:59
+     */
+    @Override
+    public List<BadgeAuditRecordResultDTO> auditRecord(TokenDto tokenDto, BadgeFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        List<BadgeAuditRecordResultDTO> list = baseDao.selectAuditRecord(tokenDto.getCustomerId(), pageIndex, formDTO.getPageSize(), formDTO.getGridId());
+        list.forEach(item ->  item.setCreateTime(item.getCreateTime()/NumConstant.SIXTY));
+        return list;
+    }
+
+    /**
+     * 审核
+     *
+     * @param tokenDto token
+     * @param formDTO 入参
+     * @return void
+     * @author zhaoqifeng
+     * @date 2020/11/5 11:08
+     */
+    @Override
+    public void audit(TokenDto tokenDto, BadgeAuditFormDTO formDTO) {
+        UserBadgeCertificateRecordDTO dto  = userBadgeCertificateRecordService.get(formDTO.getRecordId());
+        BadgeDetailResultDTO detail = baseDao.selectDetail(dto.getCustomerId(), dto.getBadgeId());
+        dto.setAuditStatus(formDTO.getAuditStatus());
+        dto.setAuditRemark(formDTO.getAuditRemark());
+        dto.setStaffId(tokenDto.getUserId());
+        dto.setIsLast(BadgeConstant.YES);
+        dto.setAuditTime(new Date());
+
+        userBadgeCertificateRecordService.update(dto);
+
+        ResiUserBadgeDTO resiUserBadgeDTO = new ResiUserBadgeDTO();
+        resiUserBadgeDTO.setCustomerId(dto.getCustomerId());
+        resiUserBadgeDTO.setBadgeId(dto.getBadgeId());
+        resiUserBadgeDTO.setGridId(dto.getGridId());
+        resiUserBadgeDTO.setUserId(dto.getUserId());
+        resiUserBadgeDTO.setIsOpened(NumConstant.ZERO);
+        resiUserBadgeDTO.setCertificationAutidStatus(dto.getAuditStatus());
+        resiUserBadgeService.save(resiUserBadgeDTO);
+
+        List<UserMessageFormDTO> msgList = new ArrayList<>();
+        if(BadgeConstant.APPROVED.equals(formDTO.getAuditStatus())) {
+            //更新Redis
+            OpenedOrClosedFormDTO openedOrClosedFormDTO = new OpenedOrClosedFormDTO();
+            openedOrClosedFormDTO.setCustomerId(dto.getCustomerId());
+            openedOrClosedFormDTO.setUserId(dto.getUserId());
+            openedOrClosedFormDTO.setBadgeId(dto.getBadgeId());
+            userBadgeService.openedOrClosed(openedOrClosedFormDTO);
+            //通知
+            UserMessageFormDTO messageFormDTO = new UserMessageFormDTO();
+            messageFormDTO.setCustomerId(dto.getCustomerId());
+            messageFormDTO.setApp(UserConstant.APP_RESI);
+            messageFormDTO.setGridId(dto.getGridId());
+            messageFormDTO.setUserId(dto.getUserId());
+            messageFormDTO.setTitle(BadgeMessageConstant.TITLE);
+            messageFormDTO.setMessageContent(String.format(BadgeMessageConstant.APPROVED_MSG, detail.getBadgeName()));
+            messageFormDTO.setReadFlag(Constant.UNREAD);
+        } else {
+            //通知
+            UserMessageFormDTO messageFormDTO = new UserMessageFormDTO();
+            messageFormDTO.setCustomerId(dto.getCustomerId());
+            messageFormDTO.setApp(UserConstant.APP_RESI);
+            messageFormDTO.setGridId(dto.getGridId());
+            messageFormDTO.setUserId(dto.getUserId());
+            messageFormDTO.setTitle(BadgeMessageConstant.TITLE);
+            messageFormDTO.setMessageContent(String.format(BadgeMessageConstant.REJECTED_MSG, detail.getBadgeName(), formDTO.getAuditRemark()));
+            messageFormDTO.setReadFlag(Constant.UNREAD);
+            msgList.add(messageFormDTO);
+        }
+        messageFeignClient.saveUserMessageList(msgList);
+    }
+
+    @Override
+    public void testCache() {
+        badgeRedis.pushOrRemoveUserBadge4List("test-wc","1","45687aa479955f9d06204d415238f7cc");
+        List<UserBadgeUnitFormDTO> cache = badgeRedis.obtainUserBadge2List("test-wc","45687aa479955f9d06204d415238f7cc");
+        System.out.println(cache);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ResiUserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ResiUserBadgeServiceImpl.java
new file mode 100644
index 0000000000..7c0730af71
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ResiUserBadgeServiceImpl.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.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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.ResiUserBadgeDao;
+import com.epmet.dto.ResiUserBadgeDTO;
+import com.epmet.entity.ResiUserBadgeEntity;
+import com.epmet.service.ResiUserBadgeService;
+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.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户徽章关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-11-06
+ */
+@Service
+public class ResiUserBadgeServiceImpl extends BaseServiceImpl<ResiUserBadgeDao, ResiUserBadgeEntity> implements ResiUserBadgeService {
+
+
+    @Override
+    public PageData<ResiUserBadgeDTO> page(Map<String, Object> params) {
+        IPage<ResiUserBadgeEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ResiUserBadgeDTO.class);
+    }
+
+    @Override
+    public List<ResiUserBadgeDTO> list(Map<String, Object> params) {
+        List<ResiUserBadgeEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ResiUserBadgeDTO.class);
+    }
+
+    private QueryWrapper<ResiUserBadgeEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ResiUserBadgeEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ResiUserBadgeDTO get(String id) {
+        ResiUserBadgeEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ResiUserBadgeDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ResiUserBadgeDTO dto) {
+        ResiUserBadgeEntity entity = ConvertUtils.sourceToTarget(dto, ResiUserBadgeEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ResiUserBadgeDTO dto) {
+        ResiUserBadgeEntity entity = ConvertUtils.sourceToTarget(dto, ResiUserBadgeEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceImgServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceImgServiceImpl.java
new file mode 100644
index 0000000000..cc8a164969
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceImgServiceImpl.java
@@ -0,0 +1,116 @@
+/**
+ * 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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.UserAdviceImgDao;
+import com.epmet.dto.UserAdviceImgDTO;
+import com.epmet.entity.UserAdviceImgEntity;
+import com.epmet.redis.UserAdviceImgRedis;
+import com.epmet.service.UserAdviceImgService;
+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.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户建议图片
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-04
+ */
+@Service
+public class UserAdviceImgServiceImpl extends BaseServiceImpl<UserAdviceImgDao, UserAdviceImgEntity> implements UserAdviceImgService {
+
+    @Autowired
+    private UserAdviceImgRedis userAdviceImgRedis;
+
+    @Override
+    public PageData<UserAdviceImgDTO> page(Map<String, Object> params) {
+        IPage<UserAdviceImgEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, UserAdviceImgDTO.class);
+    }
+
+    @Override
+    public List<UserAdviceImgDTO> list(Map<String, Object> params) {
+        List<UserAdviceImgEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, UserAdviceImgDTO.class);
+    }
+
+    private QueryWrapper<UserAdviceImgEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<UserAdviceImgEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public UserAdviceImgDTO get(String id) {
+        UserAdviceImgEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, UserAdviceImgDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(UserAdviceImgDTO dto) {
+        UserAdviceImgEntity entity = ConvertUtils.sourceToTarget(dto, UserAdviceImgEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(UserAdviceImgDTO dto) {
+        UserAdviceImgEntity entity = ConvertUtils.sourceToTarget(dto, UserAdviceImgEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * @param adviceId
+     * @return UserAdviceImgEntity
+     * @Description 根据adviceId获取关联的图片
+     * @Author liushaowen
+     * @Date 2020/11/9 9:59
+     */
+    @Override
+    public List<UserAdviceImgEntity> getImgsByAdviceId(String adviceId) {
+       return baseDao.selectList(new QueryWrapper<UserAdviceImgEntity>().eq("ADVICE_ID",adviceId));
+    }
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
new file mode 100644
index 0000000000..df0ca66996
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
@@ -0,0 +1,223 @@
+/**
+ * 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.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+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.constant.UserAdviceConstant;
+import com.epmet.dao.UserAdviceDao;
+import com.epmet.dto.UserAdviceDTO;
+import com.epmet.dto.form.AdviceListFormDTO;
+import com.epmet.dto.form.ReplyAdviceFormDTO;
+import com.epmet.dto.result.AdviceDetailResultDTO;
+import com.epmet.entity.UserAdviceEntity;
+import com.epmet.entity.UserAdviceImgEntity;
+import com.epmet.redis.UserAdviceRedis;
+import com.epmet.service.UserAdviceImgService;
+import com.epmet.service.UserAdviceService;
+import io.jsonwebtoken.lang.Collections;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * user_advice
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-06
+ */
+@Service
+public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAdviceEntity> implements UserAdviceService {
+
+    @Autowired
+    private UserAdviceRedis userAdviceRedis;
+
+    @Autowired
+    private UserAdviceImgService userAdviceImgService;
+
+    @Override
+    public PageData<UserAdviceDTO> page(Map<String, Object> params) {
+        IPage<UserAdviceEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, UserAdviceDTO.class);
+    }
+
+    @Override
+    public List<UserAdviceDTO> list(Map<String, Object> params) {
+        List<UserAdviceEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, UserAdviceDTO.class);
+    }
+
+    private QueryWrapper<UserAdviceEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<UserAdviceEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public UserAdviceDTO get(String id) {
+        UserAdviceEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, UserAdviceDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(UserAdviceDTO dto) {
+        UserAdviceEntity entity = ConvertUtils.sourceToTarget(dto, UserAdviceEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(UserAdviceDTO dto) {
+        UserAdviceEntity entity = ConvertUtils.sourceToTarget(dto, UserAdviceEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * @param dto
+     * @param loginUserId
+     * @return void
+     * @Description 回复建议
+     * @Author liushaowen
+     * @Date 2020/11/6 16:44
+     */
+    @Override
+    public void replyAdvice(ReplyAdviceFormDTO dto, String loginUserId) {
+        //检验是否已经回复过
+        UserAdviceEntity userAdviceEntity = baseDao.selectById(dto.getAdviceId());
+        if (StringUtils.isNotBlank(userAdviceEntity.getReplyContent()) || StringUtils.isNotBlank(userAdviceEntity.getReplyUserId())) {
+            throw new RenException("该建议已被回复，不能再次回复");
+        }
+        //更新advice表
+        baseDao.replyAdvice(dto.getAdviceId(), dto.getReplyContent(), dto.getGovContent(), loginUserId);
+        //如果govImg不为空，插入advice_img表
+        List<String> govImgList = dto.getGovImgList();
+        if (!Collections.isEmpty(govImgList)) {
+            List<UserAdviceImgEntity> userAdviceImgEntities = new ArrayList<>();
+            for (int i = 0; i < govImgList.size(); i++) {
+                //最多存三张图片
+                if (i == 3) {
+                    break;
+                }
+                UserAdviceImgEntity entity = new UserAdviceImgEntity();
+                entity.setImgUrl(govImgList.get(i));
+                entity.setAdviceId(dto.getAdviceId());
+                entity.setType("oper");
+                userAdviceImgEntities.add(entity);
+            }
+            userAdviceImgService.insertBatch(userAdviceImgEntities);
+        }
+    }
+
+    /**
+     * @param adviceId
+     * @return com.epmet.dto.result.AdviceDetailResultDTO
+     * @Description 建议详情
+     * @Author liushaowen
+     * @Date 2020/11/6 17:19
+     */
+    @Override
+    public AdviceDetailResultDTO adviceDetail(String adviceId) {
+        UserAdviceEntity userAdviceEntity = baseDao.selectById(adviceId);
+        AdviceDetailResultDTO adviceDetailResultDTO = new AdviceDetailResultDTO();
+        BeanUtils.copyProperties(userAdviceEntity, adviceDetailResultDTO);
+        adviceDetailResultDTO.setAdviceId(userAdviceEntity.getId());
+        adviceDetailResultDTO.setAdviceTime(userAdviceEntity.getCreatedTime());
+        //拼接建议类型
+        if (!"*".equals(userAdviceEntity.getAdviceType())) {
+            StringBuilder type = new StringBuilder();
+            if (userAdviceEntity.getAdviceType().contains("gov")) {
+                type.append(UserAdviceConstant.GOV_TYPE_TEXT);
+            }
+            if (userAdviceEntity.getAdviceType().contains("software")) {
+                if (type.length() != 0) {
+                    type.append(",");
+                }
+                type.append(UserAdviceConstant.SOFTWARE_TYPE_TEXT);
+            }
+            adviceDetailResultDTO.setAdviceType(type.toString());
+        }
+        //获取建议图片
+        List<UserAdviceImgEntity> imgsByAdviceId = userAdviceImgService.getImgsByAdviceId(adviceId);
+        List<String> govImgList = new ArrayList<>();
+        List<String> resiImgList = new ArrayList<>();
+        for (UserAdviceImgEntity entity : imgsByAdviceId) {
+            if ("resi".equals(entity.getType())) {
+                resiImgList.add(entity.getImgUrl());
+            } else if ("oper".equals(entity.getType())) {
+                govImgList.add(entity.getImgUrl());
+            }
+        }
+        adviceDetailResultDTO.setImgList(resiImgList);
+        adviceDetailResultDTO.setGovImgList(govImgList);
+        return adviceDetailResultDTO;
+    }
+
+    /**
+     * @param dto
+     * @return com.epmet.commons.tools.page.PageData<com.epmet.dto.UserAdviceDTO>
+     * @Description 查询建议列表
+     * @Author liushaowen
+     * @Date 2020/11/9 10:41
+     */
+    @Override
+    public PageData<UserAdviceDTO> adviceList(AdviceListFormDTO dto) {
+        //page分页
+        Page<UserAdviceEntity> page = new Page<>(dto.getPageNo(), dto.getPageSize());
+        //时间降序
+        page.addOrder(OrderItem.desc(FieldConstant.CREATED_TIME));
+
+        //wrapper
+        QueryWrapper<UserAdviceEntity> wrapper = new QueryWrapper<>();
+
+
+        IPage<UserAdviceEntity> result = baseDao.selectPage(page,wrapper);
+        return null;
+    }
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeCertificateRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeCertificateRecordServiceImpl.java
new file mode 100644
index 0000000000..6f798abc79
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeCertificateRecordServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * 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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.UserBadgeCertificateRecordDao;
+import com.epmet.dto.UserBadgeCertificateRecordDTO;
+import com.epmet.entity.UserBadgeCertificateRecordEntity;
+import com.epmet.service.UserBadgeCertificateRecordService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户认证徽章记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-11-05
+ */
+@Service
+public class UserBadgeCertificateRecordServiceImpl extends BaseServiceImpl<UserBadgeCertificateRecordDao, UserBadgeCertificateRecordEntity> implements UserBadgeCertificateRecordService {
+
+
+    @Override
+    public PageData<UserBadgeCertificateRecordDTO> page(Map<String, Object> params) {
+        IPage<UserBadgeCertificateRecordEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, UserBadgeCertificateRecordDTO.class);
+    }
+
+    @Override
+    public List<UserBadgeCertificateRecordDTO> list(Map<String, Object> params) {
+        List<UserBadgeCertificateRecordEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, UserBadgeCertificateRecordDTO.class);
+    }
+
+    private QueryWrapper<UserBadgeCertificateRecordEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<UserBadgeCertificateRecordEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public UserBadgeCertificateRecordDTO get(String id) {
+        UserBadgeCertificateRecordEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, UserBadgeCertificateRecordDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(UserBadgeCertificateRecordDTO dto) {
+        UserBadgeCertificateRecordEntity entity = ConvertUtils.sourceToTarget(dto, UserBadgeCertificateRecordEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(UserBadgeCertificateRecordDTO dto) {
+        UserBadgeCertificateRecordEntity entity = ConvertUtils.sourceToTarget(dto, UserBadgeCertificateRecordEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..c03dc8e726
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
@@ -0,0 +1,264 @@
+package com.epmet.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+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.commons.tools.validator.PhoneValidatorUtils;
+import com.epmet.constant.BadgeConstant;
+import com.epmet.constant.SmsTemplateConstant;
+import com.epmet.dao.UserBadgeDao;
+import com.epmet.dto.UserBadgeCertificateRecordDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.redis.UserBadgeRedis;
+import com.epmet.service.UserBadgeService;
+import com.epmet.service.UserBaseInfoService;
+import lombok.extern.slf4j.Slf4j;
+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 org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 11:18 上午
+ */
+@Service
+@Slf4j
+public class UserBadgeServiceImpl implements UserBadgeService {
+
+    @Autowired
+    private UserBadgeDao userBadgeDao;
+    @Autowired
+    private UserBadgeRedis userBadgeRedis;
+    @Autowired
+    private UserBaseInfoService userBaseInfoService;
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+    @Autowired
+    private EpmetMessageOpenFeignClient messageFeignClient;
+
+    /**
+     * @Description  查询已经点亮的徽章
+     * @Param userBadgeListFormDTO
+     * @author zxc
+     * @date 2020/11/3 1:33 下午
+     */
+    @Override
+    public List<UserBadgeListResultDTO> selectBadgeList(UserBadgeListFormDTO userBadgeListFormDTO) {
+        Object userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId());
+        if (null == userBadge){
+            this.reloadCustomerBadge(userBadgeListFormDTO.getCustomerId());
+            userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId());
+        }
+        List<UserBadgeListResultDTO> redisUserBadgeList = JSON.parseArray(userBadge.toString(), UserBadgeListResultDTO.class);
+        List<UserBadgeListResultDTO> userBadgeListResultDTOS = userBadgeDao.selectBadgeList(userBadgeListFormDTO);
+        if (CollectionUtils.isEmpty(userBadgeListResultDTOS)){
+            return redisUserBadgeList;
+        }
+        redisUserBadgeList.forEach(u -> {
+            userBadgeListResultDTOS.forEach(badge -> {
+                if (u.getBadgeId().equals(badge.getBadgeId())){
+                    badge.setBadgeIcon(u.getBadgeIcon());
+                    u.setStatus(true);
+                }
+            });
+        });
+        redisUserBadgeList.forEach(u -> {
+            if (!u.getStatus()){
+                userBadgeListResultDTOS.add(u);
+            }
+        });
+        return userBadgeListResultDTOS;
+    }
+
+    /**
+     * @Description  个人中心-获取徽章可操作列表（点亮，取消，认证）
+     * @Param userOperListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:42 下午
+     */
+    @Override
+    public List<UserOperListResultDTO> selectOperList(UserOperListFormDTO userOperListFormDTO) {
+        List<UserOperListResultDTO> userAuthBadgeList = userBadgeDao.selectAuthRecord(userOperListFormDTO.getUserId());
+        Object userBadge = userBadgeRedis.getCustomerBadge(userOperListFormDTO.getCustomerId());
+        List<UserOperListResultDTO> userOperListResultDTOS = JSON.parseArray(userBadge.toString(), UserOperListResultDTO.class);
+        // 没有任何记录
+        if (CollectionUtils.isEmpty(userAuthBadgeList)){
+            userOperListResultDTOS.forEach(u -> {
+                u.setIsLighted(u.getIsOpened().equals(NumConstant.ZERO_STR) ? BadgeConstant.NO : BadgeConstant.YES);
+                u.setIsCertificated(BadgeConstant.NO);
+                u.setIsReject(false);
+            });
+            return userOperListResultDTOS;
+        }
+        List<UserOperListResultDTO> badgeIsOpenedList = userBadgeDao.selectBadgeByUserId(userOperListFormDTO.getUserId());
+        userOperListResultDTOS.forEach(ub -> {
+            userAuthBadgeList.forEach(u -> {
+                if (ub.getBadgeId().equals(u.getBadgeId())){
+                    ub.setIsReject(u.getAuditStatus().equals(BadgeConstant.REJECTED) ? true : false);
+                    ub.setIsCertificated(u.getAuditStatus().equals(BadgeConstant.APPROVED) ? BadgeConstant.YES : BadgeConstant.NO);
+                }
+            });
+            if (CollectionUtils.isEmpty(badgeIsOpenedList)){
+                ub.setIsLighted(BadgeConstant.NO);
+            }else {
+                badgeIsOpenedList.forEach(b -> {
+                    if (ub.getBadgeId().equals(b.getBadgeId())){
+                        ub.setIsLighted(b.getIsOpened().equals(NumConstant.ZERO_STR) ? BadgeConstant.NO : BadgeConstant.YES);
+                    }
+                });
+            }
+        });
+        return userOperListResultDTOS;
+    }
+
+    /**
+     * @Description  个人中心-提交徽章认证
+     * @Param certificationAddFormDTO
+     * @author zxc
+     * @date 2020/11/4 1:36 下午
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result authBadgeRecord(CertificationAddFormDTO certificationAddFormDTO) {
+        if (StringUtils.isNotBlank(certificationAddFormDTO.getMobile())){
+            String smsCode = userBadgeRedis.getBadgeSmsCode(certificationAddFormDTO.getMobile());
+            if (!StringUtils.isNotBlank(smsCode)){
+                return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
+            }
+        }
+        UserBadgeCertificateRecordDTO form = ConvertUtils.sourceToTarget(certificationAddFormDTO, UserBadgeCertificateRecordDTO.class);
+        List<String> userIds = new ArrayList<>();
+        userIds.add(certificationAddFormDTO.getUserId());
+        List<UserBaseInfoResultDTO> userBaseInfoResultDTOS = userBaseInfoService.queryUserBaseInfo(userIds);
+        if (CollectionUtils.isEmpty(userBaseInfoResultDTOS)){
+            throw new RenException("查询用户基本信息集合为空......");
+        }
+        userBadgeDao.updateCertificateRecordIsLast(form.getBadgeId(),form.getUserId());
+        form.setGridId(userBaseInfoResultDTOS.get(NumConstant.ZERO).getRegisteredGridId());
+        form.setIdNum(certificationAddFormDTO.getIdcard());
+        form.setCertificationImg(certificationAddFormDTO.getCertificationImg());
+        form.setSurname(certificationAddFormDTO.getSurname());
+        userBadgeDao.insertUserBadgeCertificateRecord(form);
+
+        //TODO 站内信发送  您好，您的xxx徽章因认证失败未成功点亮，请查看
+        this.sendMessageByUser(form);
+
+        return new Result();
+    }
+
+    public void sendMessageByUser(UserBadgeCertificateRecordDTO form){
+        List<UserMessageFormDTO> msgList = new ArrayList<>();
+        UserMessageFormDTO formDTO = new UserMessageFormDTO();
+        formDTO.setApp(BadgeConstant.RESI);
+        formDTO.setCustomerId(form.getCustomerId());
+        formDTO.setGridId(form.getGridId());
+        UserBadgeListResultDTO userBadgeListResultDTO = userBadgeDao.selectBadgeByBadgeId(form.getCustomerId(), form.getBadgeId());
+        if (null == userBadgeListResultDTO){
+            log.error(BadgeConstant.GET_BADGE_NAME_FAILURE);
+            return;
+        }
+        formDTO.setMessageContent(String.format(BadgeConstant.MESSAGE_CONTENT,userBadgeListResultDTO.getBadgeName()));
+        formDTO.setTitle(BadgeConstant.AUTH_TITLE);
+        formDTO.setReadFlag(BadgeConstant.READ_FLAG);
+        formDTO.setUserId(form.getUserId());
+        msgList.add(formDTO);
+        Result result = messageFeignClient.saveUserMessageList(msgList);
+    }
+
+    /**
+     * @Description  发送验证码
+     * @Param badgeSendCodeFormDTO
+     * @author zxc
+     * @date 2020/11/4 3:14 下午
+     */
+    @Override
+    public void badgeSendCode(BadgeSendCodeFormDTO badgeSendCodeFormDTO) {
+        //1、校验手机号是否符合规范
+        if (!PhoneValidatorUtils.isMobile(badgeSendCodeFormDTO.getMobile())) {
+            log.error(String.format("发送短信验证码异常,手机号[%s],code[%s],msg[%s]", badgeSendCodeFormDTO.getMobile(), EpmetErrorCode.ERROR_PHONE.getCode(), EpmetErrorCode.ERROR_PHONE.getMsg()));
+            throw new RenException(EpmetErrorCode.ERROR_PHONE.getCode());
+        }
+        //3、发送短信验证码
+        SendVerificationCodeFormDTO sendVerificationCodeFormDTO=new SendVerificationCodeFormDTO();
+        sendVerificationCodeFormDTO.setMobile(badgeSendCodeFormDTO.getMobile());
+        sendVerificationCodeFormDTO.setAliyunTemplateCode(SmsTemplateConstant.LGOIN_CONFIRM);
+        Result<SendVerificationCodeResultDTO> smsCodeResult=epmetMessageOpenFeignClient.sendVerificationCode(sendVerificationCodeFormDTO);
+        if (!smsCodeResult.success()) {
+            log.error(String.format("发送短信验证码异常,手机号[%s],code[%s],msg[%s]", badgeSendCodeFormDTO.getMobile(), smsCodeResult.getCode(), smsCodeResult.getMsg()));
+            throw new RenException(smsCodeResult.getCode());
+        }
+        //4、保存短信验证码(删除现有短信验证码、将新的短信验证码存入Redis)
+        userBadgeRedis.saveBadgeSmsCode(badgeSendCodeFormDTO.getMobile(),smsCodeResult.getData().getCode());
+        log.info(String.format("发送短信验证码成功,手机号[%s]", badgeSendCodeFormDTO.getMobile()));
+    }
+
+    /**
+     * @Description  个人中心-获取徽章认证页面详情
+     * @Param tokenDto
+     * @Param certificationDetailFormDTO
+     * @author zxc
+     * @date 2020/11/4 4:03 下午
+     */
+    @Override
+    public CertificationDetailResultDTO certificationDetail(TokenDto tokenDto, CertificationDetailFormDTO certificationDetailFormDTO) {
+        certificationDetailFormDTO.setUserId(tokenDto.getUserId());
+        return userBadgeDao.selectBadgeAuthRecord(certificationDetailFormDTO.getUserId(), certificationDetailFormDTO.getBadgeId());
+    }
+
+
+    /**
+     * @Description  个人中心-查询徽章要显示的认证信息字段
+     * @Param authFieldFormDTO
+     * @author zxc
+     * @date 2020/11/4 5:05 下午
+     */
+    @Override
+    public List<AuthFieldResultDTO> authField(AuthFieldFormDTO authFieldFormDTO) {
+        List<AuthFieldResultDTO> authFieldResultDTOS = userBadgeDao.selectAuthField(authFieldFormDTO);
+        if (CollectionUtils.isEmpty(authFieldResultDTOS)){
+            return new ArrayList<>();
+        }
+        return authFieldResultDTOS;
+    }
+
+    /**
+     * @Description 个人中心-取消/点亮徽章
+     * @Param openedOrClosedFormDTO
+     * @author zxc
+     * @date 2020/11/4 5:47 下午
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void openedOrClosed(OpenedOrClosedFormDTO form) {
+        userBadgeDao.updateIsOpen(form);
+        userBadgeRedis.pushOrRemoveUserBadge4List(form.getUserId(),form.getBadgeId(),form.getCustomerId());
+    }
+
+    /**
+     * @Description  客户徽章缓存初始化
+     * @Param customerId
+     * @author zxc
+     * @date 2020/11/5 3:12 下午
+     */
+    @Override
+    public void reloadCustomerBadge(String customerId){
+        userBadgeRedis.delCustomerBadge(customerId);
+        List<UserBadgeListResultDTO> userBadgeListResultDTOS = userBadgeDao.selectAllBadge(customerId);
+        if (CollectionUtils.isEmpty(userBadgeListResultDTOS)){
+            throw new RenException("客户徽章缓存初始化未查到数据");
+        }
+        userBadgeRedis.setCustomerBadge(userBadgeListResultDTOS, customerId);
+    }
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
index e8148b7418..c86ed47eaf 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
@@ -325,4 +325,22 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		return userResiInfoDao.selectIssueInitiator(formDTO);
 	}
 
+	/**
+	 * 修改个人信息
+	 *
+	 * @param formDTO
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/11/3 10:29
+	 */
+	@Override
+	public void editUserInfo(EditInfoFormDTO formDTO) {
+		//更新居民注册信息表
+		baseDao.updateByUserId(ConvertUtils.sourceToTarget(formDTO, UserResiInfoEntity.class));
+		//更新baseInfo
+		UserBaseInfoEntity baseInfo = ConvertUtils.sourceToTarget(formDTO, UserBaseInfoEntity.class);
+		baseInfo.setRealName(formDTO.getSurname() + formDTO.getName());
+		userBaseInfoService.insertOrUpdate(baseInfo);
+	}
+
 }
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
new file mode 100644
index 0000000000..0e605aa9ab
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/2020-11-03_badege.sql
@@ -0,0 +1,199 @@
+/*
+ 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/mapper/BadgeCertificationConfigDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeCertificationConfigDao.xml
new file mode 100644
index 0000000000..251523c8d3
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeCertificationConfigDao.xml
@@ -0,0 +1,42 @@
+<?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.BadgeCertificationConfigDao">
+
+    <resultMap type="com.epmet.entity.BadgeCertificationConfigEntity" id="badgeCertificationConfigMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="badgeId" column="BADGE_ID"/>
+        <result property="certificationType" column="CERTIFICATION_TYPE"/>
+        <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>
+    <delete id="deleteConfig">
+        DELETE a
+        FROM
+            badge_certification_config a
+        WHERE
+            EXISTS (
+                    SELECT
+                        *
+                    FROM
+                        ( SELECT ID FROM badge_certification_config
+                        WHERE CUSTOMER_ID = #{customerId}
+                          AND BADGE_ID = #{badgeId}
+                          AND DEL_FLAG = '0' ) b
+                    WHERE
+                        a.ID = b.ID)
+    </delete>
+    <select id="getCertificationType" resultType="java.lang.String">
+        select CERTIFICATION_TYPE from badge_certification_config
+        where CUSTOMER_ID = #{customerId}
+            and BADGE_ID = #{badgeId}
+            and DEL_FLAG = '0'
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml
new file mode 100644
index 0000000000..e482f95095
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml
@@ -0,0 +1,251 @@
+<?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.BadgeDao">
+
+    <resultMap type="com.epmet.entity.BadgeEntity" id="badgeMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="badgeName" column="BADGE_NAME"/>
+        <result property="badgeIcon" column="BADGE_ICON"/>
+        <result property="fixationBadgeType" column="FIXATION_BADGE_TYPE"/>
+        <result property="badgeStatus" column="BADGE_STATUS"/>
+        <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>
+    <insert id="insertBadge">
+        INSERT INTO badge
+            (`ID`,
+             `CUSTOMER_ID`,
+             `BADGE_NAME`,
+             `BADGE_ICON`,
+             `FIXATION_BADGE_TYPE`,
+             `BADGE_STATUS`,
+             `DEL_FLAG`,
+             `REVISION`,
+             `CREATED_BY`,
+             `CREATED_TIME`,
+             `UPDATED_BY`,
+             `UPDATED_TIME`)
+        VALUES
+           (#{id},
+            #{customerId},
+            #{badgeName},
+            #{badgeIcon},
+            #{fixationBadgeType},
+            #{badgeStatus},
+            #{delFlag},
+            #{revision},
+            #{createdBy},
+            #{createdTime},
+            #{updatedBy},
+            #{updatedTime});
+
+    </insert>
+    <update id="updateBadge" parameterType="com.epmet.entity.BadgeEntity">
+        update badge set
+            BADGE_NAME = #{badgeName},
+            BADGE_ICON = #{badgeIcon},
+            BADGE_STATUS = #{badgeStatus}
+        where ID = #{id} AND CUSTOMER_ID = #{customerId}
+
+    </update>
+    <update id="deleteBadge">
+        update badge set
+            DEL_FLAG = '1'
+        where ID = #{badgeId} AND CUSTOMER_ID = #{customerId}
+    </update>
+    <select id="selectList" resultType="com.epmet.dto.result.BadgeListResultDTO">
+        SELECT
+            ID AS "badgeId",
+            BADGE_NAME,
+            BADGE_ICON,
+            BADGE_STATUS
+        FROM
+            (
+                SELECT * FROM badge
+                WHERE CUSTOMER_ID = #{customerId} AND DEL_FLAG = '0'
+                UNION ALL
+                SELECT * FROM badge a
+                WHERE CUSTOMER_ID = 'default' AND a.DEL_FLAG = '0'
+                  AND NOT EXISTS
+                    ( SELECT ID FROM badge b WHERE CUSTOMER_ID = #{customerId} AND a.ID = b.ID)) t
+        ORDER BY
+            CREATED_TIME DESC
+    </select>
+    <select id="getDuplicateName" resultType="com.epmet.dto.result.BadgeListResultDTO">
+        SELECT
+            *
+        FROM
+        (SELECT
+            ID AS "badgeId",
+            BADGE_NAME,
+            BADGE_ICON,
+            BADGE_STATUS
+        FROM
+            (
+                SELECT * FROM badge
+                WHERE CUSTOMER_ID = #{customerId} AND DEL_FLAG = '0'
+                UNION ALL
+                SELECT * FROM badge a
+                WHERE CUSTOMER_ID = 'default' AND a.DEL_FLAG = '0'
+                  AND NOT EXISTS
+                    ( SELECT ID FROM badge b WHERE CUSTOMER_ID = #{customerId} AND a.BADGE_NAME = b.BADGE_NAME)) t) a
+        WHERE BADGE_NAME = #{badgeName}
+    </select>
+    <select id="selectDetail" resultType="com.epmet.dto.result.BadgeDetailResultDTO">
+        SELECT
+            *
+        FROM
+            (SELECT
+                 ID AS "badgeId",
+                 BADGE_NAME,
+                 BADGE_ICON,
+                 BADGE_STATUS
+             FROM
+                 (
+                     SELECT * FROM badge
+                     WHERE CUSTOMER_ID = #{customerId} AND DEL_FLAG = '0'
+                     UNION ALL
+                     SELECT * FROM badge a
+                     WHERE CUSTOMER_ID = 'default' AND a.DEL_FLAG = '0'
+                       AND NOT EXISTS
+                         ( SELECT ID FROM badge b WHERE CUSTOMER_ID = #{customerId} AND a.BADGE_NAME = b.BADGE_NAME  )) t) a
+        WHERE badgeId = #{badgeId}
+    </select>
+    <select id="getDuplicateNameForEdit" resultType="com.epmet.dto.result.BadgeListResultDTO">
+        SELECT
+            *
+        FROM
+            (SELECT
+                 ID AS "badgeId",
+                 BADGE_NAME,
+                 BADGE_ICON,
+                 BADGE_STATUS
+             FROM
+                 (
+                     SELECT * FROM badge
+                     WHERE CUSTOMER_ID = #{customerId} AND DEL_FLAG = '0'
+                     UNION ALL
+                     SELECT * FROM badge a
+                     WHERE CUSTOMER_ID = 'default' AND a.DEL_FLAG = '0'
+                       AND NOT EXISTS
+                         ( SELECT ID FROM badge b WHERE CUSTOMER_ID = #{customerId} AND a.BADGE_NAME = b.BADGE_NAME )) t) a
+        WHERE BADGE_NAME = #{badgeName} AND badgeId != #{badgeId}
+    </select>
+    <select id="selectBadgeInfo" resultType="com.epmet.entity.BadgeEntity">
+        select * from badge where DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} AND ID = #{badgeId}
+    </select>
+    <select id="selectAuditingList" resultType="com.epmet.dto.result.BadgeAuditingResultDTO">
+        SELECT
+            ubcr.ID AS "badgeId",
+            badge.BADGE_NAME,
+            badge.BADGE_ICON,
+            ubcr.USER_ID,
+            ubi.REAL_NAME AS "userName",
+            unix_timestamp(ubcr.CREATED_TIME) AS "createTime"
+        FROM
+            user_badge_certificate_record  ubcr
+            LEFT JOIN user_base_info ubi ON ubcr.USER_ID = ubi.USER_ID
+            LEFT JOIN (SELECT
+                    ID,
+                    BADGE_NAME,
+                    BADGE_ICON,
+                    BADGE_STATUS
+                FROM
+                    (
+                        SELECT * FROM badge
+                        WHERE CUSTOMER_ID = #{customerId} AND DEL_FLAG = '0'
+                        UNION ALL
+                        SELECT * FROM badge a
+                        WHERE CUSTOMER_ID = 'default' AND a.DEL_FLAG = '0'
+                          AND NOT EXISTS
+                            ( SELECT ID FROM badge b WHERE CUSTOMER_ID = #{customerId} AND a.ID = b.ID AND b.DEL_FLAG = '0')) t) badge ON ubcr.BADGE_ID = badge.ID
+        WHERE
+            AUDIT_STATUS = 'auditing'
+            AND ubcr.DEL_FLAG = '0'
+            AND ubcr.CUSTOMER_ID = #{customerId}
+            AND ubcr.GRID_ID = #{gridId}
+        ORDER BY ubcr.CREATED_TIME DESC
+        LIMIT #{pageNo}, #{pageSize}
+    </select>
+    <select id="selectAuditRecord" resultType="com.epmet.dto.result.BadgeAuditRecordResultDTO">
+        SELECT
+            ubcr.ID AS "badgeId",
+            badge.BADGE_NAME,
+            badge.BADGE_ICON,
+            ubcr.USER_ID,
+            ubcr.AUDIT_STATUS,
+            ubi.REAL_NAME AS "userName",
+            unix_timestamp(ubcr.CREATED_TIME) AS "createTime"
+        FROM
+            user_badge_certificate_record  ubcr
+                LEFT JOIN user_base_info ubi ON ubcr.USER_ID = ubi.USER_ID
+                LEFT JOIN (SELECT
+                               ID,
+                               BADGE_NAME,
+                               BADGE_ICON,
+                               BADGE_STATUS
+                           FROM
+                               (
+                                   SELECT * FROM badge
+                                   WHERE CUSTOMER_ID = #{customerId} AND DEL_FLAG = '0'
+                                   UNION ALL
+                                   SELECT * FROM badge a
+                                   WHERE CUSTOMER_ID = 'default' AND a.DEL_FLAG = '0'
+                                     AND NOT EXISTS
+                                       ( SELECT ID FROM badge b WHERE CUSTOMER_ID = #{customerId} AND a.ID = b.ID AND b.DEL_FLAG = '0')) t) badge ON ubcr.BADGE_ID = badge.ID
+        WHERE
+            AUDIT_STATUS != 'auditing'
+          AND ubcr.DEL_FLAG = '0'
+          AND ubcr.CUSTOMER_ID = #{customerId}
+          AND ubcr.GRID_ID = #{gridId}
+        ORDER BY ubcr.CREATED_TIME DESC
+        LIMIT #{pageNo}, #{pageSize}
+    </select>
+
+    <!-- 查询客户的徽章 -->
+    <select id="selectCustomerBadgePool" resultType="com.epmet.dto.result.UserBadgeListResultDTO">
+        SELECT
+            temp.badgeId,
+            temp.BADGE_ICON,
+            temp.BADGE_NAME,
+            temp.CUSTOMER_ID,
+            temp.UPDATED_TIME
+        FROM(
+                SELECT
+                    ID AS badgeId,
+                    CUSTOMER_ID,
+                    BADGE_NAME ,
+                    BADGE_ICON ,
+                    UPDATED_TIME
+                FROM
+                    BADGE
+                WHERE
+                    DEL_FLAG = '0'
+                    AND BADGE_STATUS = 'online'
+                    AND CUSTOMER_ID = #{customerId}
+
+                UNION
+
+                SELECT
+                    outter.ID AS badgeId,
+                    outter.CUSTOMER_ID,
+                    outter.BADGE_NAME,
+                    outter.BADGE_ICON,
+                    outter.UPDATED_TIME
+                FROM
+                    BADGE outter
+                WHERE
+                    DEL_FLAG = '0'
+                    AND BADGE_STATUS = 'online'
+                    AND CUSTOMER_ID = 'default'
+                    AND NOT EXISTS ( SELECT id FROM badge WHERE del_flag = '0' AND customer_id = #{customerId} AND ID = outter.ID AND badge_status = 'online' )
+        ) AS temp ORDER BY temp.UPDATED_TIME DESC
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ResiUserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ResiUserBadgeDao.xml
new file mode 100644
index 0000000000..221c9c3d3f
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ResiUserBadgeDao.xml
@@ -0,0 +1,23 @@
+<?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.ResiUserBadgeDao">
+
+    <resultMap type="com.epmet.entity.ResiUserBadgeEntity" id="resiUserBadgeMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="badgeId" column="BADGE_ID"/>
+        <result property="isOpened" column="IS_OPENED"/>
+        <result property="certificationAutidStatus" column="CERTIFICATION_AUTID_STATUS"/>
+        <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>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml
new file mode 100644
index 0000000000..0f7d01cd50
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml
@@ -0,0 +1,46 @@
+<?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.UserAdviceDao">
+
+    <resultMap type="com.epmet.entity.UserAdviceEntity" id="userAdviceMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="customerName" column="CUSTOMER_NAME"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="agencyName" column="AGENCY_NAME"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="userName" column="USER_NAME"/>
+        <result property="regPhone" column="REG_PHONE"/>
+        <result property="adviceContent" column="ADVICE_CONTENT"/>
+        <result property="phone" column="PHONE"/>
+        <result property="adviceType" column="ADVICE_TYPE"/>
+        <result property="replyContent" column="REPLY_CONTENT"/>
+        <result property="replyUserId" column="REPLY_USER_ID"/>
+        <result property="replyUserName" column="REPLY_USER_NAME"/>
+        <result property="replyTime" column="REPLY_TIME"/>
+        <result property="govContent" column="GOV_CONTENT"/>
+        <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>
+
+    <update id="replyAdvice" >
+        update user_advice
+        set
+          reply_content = #{replyContent},
+          reply_user_id = #{replyUserId},
+          reply_time = now(),
+          gov_content = #{govContent},
+          reply_user_name = (select real_name from oper_user where user_id = #{replyUserId} and del_flag = 0),
+          updated_by = #{replyUserId},
+          updated_time = now()
+        where id = #{adviceId} and del_flag = 0
+    </update>
+
+</mapper>
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceImgDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceImgDao.xml
new file mode 100644
index 0000000000..8bb5ff3792
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceImgDao.xml
@@ -0,0 +1,20 @@
+<?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.UserAdviceImgDao">
+
+    <resultMap type="com.epmet.entity.UserAdviceImgEntity" id="userAdviceImgMap">
+        <result property="id" column="ID"/>
+        <result property="adviceId" column="ADVICE_ID"/>
+        <result property="type" column="TYPE"/>
+        <result property="imgUrl" column="IMG_URL"/>
+        <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>
+
+
+</mapper>
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeCertificateRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeCertificateRecordDao.xml
new file mode 100644
index 0000000000..a2f59e8b8e
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeCertificateRecordDao.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.UserBadgeCertificateRecordDao">
+
+    <resultMap type="com.epmet.entity.UserBadgeCertificateRecordEntity" id="userBadgeCertificateRecordMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="badgeId" column="BADGE_ID"/>
+        <result property="surname" column="SURNAME"/>
+        <result property="name" column="NAME"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="idNum" column="ID_NUM"/>
+        <result property="certificationImg" column="CERTIFICATION_IMG"/>
+        <result property="remaek" column="REMAEK"/>
+        <result property="auditStatus" column="AUDIT_STATUS"/>
+        <result property="auditRemark" column="AUDIT_REMARK"/>
+        <result property="staffId" column="STAFF_ID"/>
+        <result property="auditTime" column="AUDIT_TIME"/>
+        <result property="isLast" column="IS_LAST"/>
+        <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>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
new file mode 100644
index 0000000000..c62269205f
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
@@ -0,0 +1,205 @@
+<?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.UserBadgeDao">
+
+    <!-- 更新认证徽章记录最新 -->
+    <update id="updateCertificateRecordIsLast">
+        UPDATE user_badge_certificate_record
+        SET is_last = 'no'
+        WHERE DEL_FLAG = '0'
+          AND BADGE_ID = #{badgeId}
+          AND USER_ID = #{userId}
+    </update>
+
+    <!-- 个人中心-取消/点亮徽章 -->
+    <update id="updateIsOpen">
+        UPDATE resi_user_badge
+        SET IS_OPENED = (case when IS_OPENED = 1 THEN 0 ELSE 1 END),
+            UPDATED_TIME = NOW()
+        WHERE DEL_FLAG = '0'
+          AND USER_ID = #{userId}
+          AND BADGE_ID = #{badgeId}
+    </update>
+
+    <!-- 查询已经点亮的徽章 -->
+    <select id="selectBadgeList" resultType="com.epmet.dto.result.UserBadgeListResultDTO">
+        SELECT
+            ub.BADGE_ID,
+            ub.IS_OPENED,
+            b.FIXATION_BADGE_TYPE as badgeType
+        FROM resi_user_badge ub
+        LEFT JOIN badge b ON b.ID = ub.BADGE_ID
+        WHERE ub.DEL_FLAG = '0'
+            AND b.DEL_FLAG = 0
+            AND ub.CERTIFICATION_AUTID_STATUS = 'pass'
+            AND b.CUSTOMER_ID = 'default'
+            AND b.BADGE_STATUS = 'online'
+            AND ub.USER_ID = #{userId}
+            ORDER BY ub.UPDATED_TIME DESC
+    </select>
+
+    <!-- 查询默认徽章和改名后的徽章 -->
+    <select id="selectAllBadge" resultType="com.epmet.dto.result.UserBadgeListResultDTO">
+        SELECT
+            id AS badgeId,
+            CUSTOMER_ID,
+            BADGE_NAME,
+            BADGE_ICON,
+            FIXATION_BADGE_TYPE AS badgeType
+        FROM (
+                 SELECT * FROM badge
+                 WHERE CUSTOMER_ID = #{customerId} AND DEL_FLAG = '0'
+                 UNION ALL
+                 SELECT * FROM badge a
+                 WHERE CUSTOMER_ID = 'default' AND a.DEL_FLAG = '0' AND BADGE_STATUS = 'online'
+                   AND NOT EXISTS
+                     ( SELECT ID FROM badge b WHERE CUSTOMER_ID = #{customerId} AND a.ID = b.ID)) t
+        ORDER BY
+            CREATED_TIME DESC
+    </select>
+
+    <!-- 查询徽章认证记录 -->
+    <select id="selectAuthRecord" resultType="com.epmet.dto.result.UserOperListResultDTO">
+        SELECT
+            CUSTOMER_ID,
+            BADGE_ID,
+            CERTIFICATION_IMG,
+            AUDIT_STATUS
+        FROM user_badge_certificate_record
+        WHERE DEL_FLAG = 0
+            AND IS_LAST = 'yes'
+            AND USER_ID = #{userId}
+    </select>
+
+    <!-- 根据UserId查询个人徽章点亮信息 -->
+    <select id="selectBadgeByUserId" resultType="com.epmet.dto.result.UserOperListResultDTO">
+        SELECT
+            BADGE_ID,
+            IS_OPENED
+        FROM resi_user_badge
+        WHERE
+            DEL_FLAG = '0'
+            AND CERTIFICATION_AUTID_STATUS = 'pass'
+            AND USER_ID = #{userId}
+    </select>
+
+    <!-- 查询单个徽章的认证记录 -->
+    <select id="selectBadgeAuthRecord" resultType="com.epmet.dto.result.CertificationDetailResultDTO">
+        SELECT
+            SURNAME,
+            NAME,
+            ID_NUM AS idCard,
+            ( CASE WHEN AUDIT_STATUS = 'approved' THEN 'yes' ELSE 'no' END ) AS isCertificated,
+            MOBILE,
+            CERTIFICATION_IMG,
+            REMAEK AS remark,
+            CUSTOMER_ID,
+            BADGE_ID,
+            CERTIFICATION_IMG,
+            AUDIT_STATUS,
+            AUDIT_STATUS AS authResult,
+            AUDIT_REMARK AS authReason,
+            ID AS recordId
+        FROM
+            user_badge_certificate_record
+        WHERE
+            DEL_FLAG = 0
+            AND IS_LAST = 'yes'
+            AND BADGE_ID = #{badgeId}
+            AND USER_ID = #{userId}
+    </select>
+
+    <!-- 个人中心-查询徽章要显示的认证信息字段 -->
+    <select id="selectAuthField" resultType="com.epmet.dto.result.AuthFieldResultDTO">
+        SELECT
+            cf.CN_NAME,
+            cf.EN_NAME,
+            cf.FIELD_TYPE,
+            cf.IS_REQUIRED,
+            cf.SORT
+        FROM badge_certification_config_field cf
+        LEFT JOIN badge_certification_config cc ON cc.CERTIFICATION_TYPE = cf.CERTIFICATION_TYPE
+        WHERE cf.DEL_FLAG = 0
+            AND cc.DEL_FLAG = 0
+            AND cc.CUSTOMER_ID = #{customerId}
+            AND cc.BADGE_ID = #{badgeId}
+            ORDER BY cf.SORT
+    </select>
+    <select id="selectBadgeByBadgeId" resultType="com.epmet.dto.result.UserBadgeListResultDTO">
+        SELECT
+            ID AS badgeId,
+            BADGE_NAME,
+            BADGE_ICON,
+            BADGE_STATUS
+        FROM
+            (
+                SELECT * FROM badge
+                WHERE CUSTOMER_ID = #{customerId}
+                  AND DEL_FLAG = '0'
+                  AND ID = #{badgeId}
+                UNION ALL
+                SELECT * FROM badge a
+                WHERE CUSTOMER_ID = 'default'
+                  AND a.DEL_FLAG = '0'
+                  AND BADGE_STATUS = 'online'
+                  AND ID = #{badgeId}
+                  AND NOT EXISTS
+                    ( SELECT ID FROM badge b WHERE CUSTOMER_ID = #{customerId} AND a.ID = b.ID)
+            ) t
+    </select>
+
+    <!--  徽章审核记录表插入  -->
+    <insert id="insertUserBadgeCertificateRecord">
+        INSERT INTO user_badge_certificate_record (
+            ID,
+            CUSTOMER_ID,
+            GRID_ID,
+            USER_ID,
+            BADGE_ID,
+            SURNAME,
+            NAME,
+            MOBILE,
+            ID_NUM,
+            CERTIFICATION_IMG,
+            REMAEK,
+            AUDIT_STATUS,
+            AUDIT_REMARK,
+            STAFF_ID,
+            AUDIT_TIME,
+            IS_LAST,
+            DEL_FLAG,
+            REVISION,
+            CREATED_BY,
+            CREATED_TIME,
+            UPDATED_BY,
+            UPDATED_TIME
+        )
+        VALUES
+        (
+            REPLACE ( UUID(), '-', '' ),
+            #{customerId},
+            #{gridId},
+            #{userId},
+            #{badgeId},
+            #{surname},
+            #{name},
+            #{mobile},
+            #{idNum},
+            #{certificationImg},
+            #{remark},
+            #{auditStatus},
+            #{auditRemark},
+            #{staffId},
+            #{auditTime},
+            #{isLast},
+            #{delFlag},
+            #{revision},
+            #{createdBy},
+            NOW(),
+            #{updatedBy},
+            NOW()
+        )
+    </insert>
+
+</mapper>
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
index fc345f9fd2..0dddb3b46c 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
@@ -37,6 +37,16 @@
         uri.updated_by AS "updatedby",
         uri.updated_time AS "updatedtime"
     </sql>
+    <update id="updateByUserId">
+        update user_resi_info set
+            SURNAME = #{surname},
+            NAME = #{name},
+            STREET = #{street},
+            DISTRICT = #{district},
+            BUILDING_ADDRESS = #{buildingAddress}
+        where USER_ID = #{userId}
+        and DEL_FLAG = '0'
+    </update>
 
     <!-- 查询用户注册信息   -->
     <select id="selectUserResiInfoDTO" parameterType="com.epmet.dto.form.UserResiInfoFormDTO"