Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp

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 {
+}

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 {
+}

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);
+    }
+}

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);
+}

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;
+    }
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceDTO.java

@@ -0,0 +1,111 @@
+/**
+ * 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 UserAdviceDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * userid
+     */
+	private String userId;
+
+    /**
+     * 建议描述
+     */
+	private String adviceContent;
+
+    /**
+     * 手机号
+     */
+	private String phone;
+
+    /**
+     * 问题分类(gov政府software软件,逗号分隔)
+     */
+	private String adviceType;
+
+    /**
+     * 回复内容
+     */
+	private String replyContent;
+
+    /**
+     * 回复人
+     */
+	private String replyUser;
+
+    /**
+     * 回复时间
+     */
+	private Date replyTime;
+
+    /**
+     * 删除标志
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceImgDTO.java

@@ -0,0 +1,81 @@
+/**
+ * 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;
+
+    /**
+     * 图片url
+     */
+	private String imgUrl;
+
+    /**
+     * 删除标志
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.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.UserAdviceDTO;
+import com.epmet.excel.UserAdviceExcel;
+import com.epmet.service.UserAdviceService;
+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("useradvice")
+public class UserAdviceController {
+    
+    @Autowired
+    private UserAdviceService userAdviceService;
+
+    @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);
+    }
+
+}

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);
+    }
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserAdviceDao.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.UserAdviceEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户建议
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-04
+ */
+@Mapper
+public interface UserAdviceDao extends BaseDao<UserAdviceEntity> {
+	
+}

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> {
+	
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java

@@ -34,7 +34,7 @@ public interface UserBadgeDao {
      * @author zxc
      * @date 2020/11/3 3:11 下午
      */
-    List<UserBadgeListResultDTO> selectAllBadge(UserBadgeListFormDTO userBadgeListFormDTO);
+    List<UserBadgeListResultDTO> selectAllBadge(@Param("customerId") String customerId);
 
     /**
      * @Description  查询徽章认证记录

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java

@@ -0,0 +1,81 @@
+/**
+ * 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.BaseEpdcEntity;
+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")
+public class UserAdviceEntity extends BaseEpdcEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * userid
+     */
+	private String userId;
+
+    /**
+     * 建议描述
+     */
+	private String adviceContent;
+
+    /**
+     * 手机号
+     */
+	private String phone;
+
+    /**
+     * 问题分类(gov政府software软件,逗号分隔)
+     */
+	private String adviceType;
+
+    /**
+     * 回复内容
+     */
+	private String replyContent;
+
+    /**
+     * 回复人
+     */
+	private String replyUser;
+
+    /**
+     * 回复时间
+     */
+	private Date replyTime;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceImgEntity.java

@@ -0,0 +1,51 @@
+/**
+ * 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.BaseEpdcEntity;
+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 BaseEpdcEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 建议id
+     */
+	private String adviceId;
+
+    /**
+     * 图片url
+     */
+	private String imgUrl;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserAdviceExcel.java

@@ -0,0 +1,80 @@
+/**
+ * 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 UserAdviceExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "userid")
+    private String userId;
+
+    @Excel(name = "建议描述")
+    private String adviceContent;
+
+    @Excel(name = "手机号")
+    private String phone;
+
+    @Excel(name = "问题分类(gov政府software软件,逗号分隔)")
+    private String adviceType;
+
+    @Excel(name = "回复内容")
+    private String replyContent;
+
+    @Excel(name = "回复人")
+    private String replyUser;
+
+    @Excel(name = "回复时间")
+    private Date replyTime;
+
+    @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;
+
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserAdviceImgExcel.java

@@ -0,0 +1,62 @@
+/**
+ * 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 = "图片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;
+
+
+}

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;
+    }
+
+}

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;
+
+/**
+ * 用户建议
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-04
+ */
+@Component
+public class UserAdviceRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java

@@ -22,7 +22,7 @@ public class UserBadgeRedis {
     private RedisUtils redisUtils;
 
     /**
-     * @Description  获取徽章信息
+     * @Description  获取客户徽章信息
      * @Param customerId
      * @author zxc
      * @date 2020/11/3 2:50 下午
@@ -33,7 +33,7 @@ public class UserBadgeRedis {
     }
 
     /**
-     * @Description  存放徽章信息
+     * @Description  存放客户徽章信息
      * @Param userBadge
      * @Param customerId
      * @author zxc
@@ -43,6 +43,16 @@ public class UserBadgeRedis {
         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

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceImgService.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.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);
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.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.UserAdviceDTO;
+import com.epmet.entity.UserAdviceEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户建议
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-11-04
+ */
+public interface UserAdviceService extends BaseService<UserAdviceEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<UserAdviceDTO>
+     * @author generator
+     * @date 2020-11-04
+     */
+    PageData<UserAdviceDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<UserAdviceDTO>
+     * @author generator
+     * @date 2020-11-04
+     */
+    List<UserAdviceDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return UserAdviceDTO
+     * @author generator
+     * @date 2020-11-04
+     */
+    UserAdviceDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-11-04
+     */
+    void save(UserAdviceDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-11-04
+     */
+    void update(UserAdviceDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-11-04
+     */
+    void delete(String[] ids);
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeService.java

@@ -73,4 +73,12 @@ public interface UserBadgeService {
      */
     void openedOrClosed(OpenedOrClosedFormDTO openedOrClosedFormDTO);
 
+    /**
+     * @Description  客户徽章缓存初始化
+     * @Param customerId
+     * @author zxc
+     * @date 2020/11/5 3:12 下午
+     */
+    void reloadCustomerBadge(String customerId);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceImgServiceImpl.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.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));
+    }
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.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.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.UserAdviceDao;
+import com.epmet.dto.UserAdviceDTO;
+import com.epmet.entity.UserAdviceEntity;
+import com.epmet.redis.UserAdviceRedis;
+import com.epmet.service.UserAdviceService;
+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 UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAdviceEntity> implements UserAdviceService {
+
+    @Autowired
+    private UserAdviceRedis userAdviceRedis;
+
+    @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));
+    }
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java

@@ -58,27 +58,8 @@ public class UserBadgeServiceImpl implements UserBadgeService {
     public List<UserBadgeListResultDTO> selectBadgeList(UserBadgeListFormDTO userBadgeListFormDTO) {
         Object userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId());
         if (null == userBadge){
-            List<UserBadgeListResultDTO> resultUserBadge = new ArrayList<>();
+            this.reloadCustomerBadge(userBadgeListFormDTO.getCustomerId());
-            List<UserBadgeListResultDTO> userBadgeListResultDTOS = userBadgeDao.selectAllBadge(userBadgeListFormDTO);
+            userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId());
-            if (!CollectionUtils.isEmpty(userBadgeListResultDTOS)){
-                Map<String, List<UserBadgeListResultDTO>> groupByCustomer = userBadgeListResultDTOS.stream().collect(Collectors.groupingBy(UserBadgeListResultDTO::getCustomerId));
-                resultUserBadge.addAll(groupByCustomer.get(BadgeConstant.DEFAULT_CUSTOMER));
-                List<UserBadgeListResultDTO> badgeByCustomer = groupByCustomer.get(userBadgeListFormDTO.getCustomerId());
-                if (!CollectionUtils.isEmpty(badgeByCustomer)) {
-                    resultUserBadge.forEach(r -> {
-                        badgeByCustomer.forEach(b -> {
-                            if (r.getBadgeId().equals(b.getBadgeId())) {
-                                BeanUtils.copyProperties(b, r);
-                            }
-                        });
-                    });
-                    userBadgeRedis.setCustomerBadge(resultUserBadge, userBadgeListFormDTO.getCustomerId());
-                    userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId());
-                }else {
-                    userBadgeRedis.setCustomerBadge(resultUserBadge, userBadgeListFormDTO.getCustomerId());
-                    userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId());
-                }
-            }
         }
         List<UserBadgeListResultDTO> redisUserBadgeList = JSON.parseArray(userBadge.toString(), UserBadgeListResultDTO.class);
         List<UserBadgeListResultDTO> userBadgeListResultDTOS = userBadgeDao.selectBadgeList(userBadgeListFormDTO);
@@ -241,4 +222,34 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         userBadgeDao.updateIsOpen(openedOrClosedFormDTO);
     }
 
+    /**
+     * @Description  客户徽章缓存初始化
+     * @Param customerId
+     * @author zxc
+     * @date 2020/11/5 3:12 下午
+     */
+    @Override
+    public void reloadCustomerBadge(String customerId){
+        userBadgeRedis.delCustomerBadge(customerId);
+        List<UserBadgeListResultDTO> resultUserBadge = new ArrayList<>();
+        List<UserBadgeListResultDTO> userBadgeListResultDTOS = userBadgeDao.selectAllBadge(customerId);
+        if (!CollectionUtils.isEmpty(userBadgeListResultDTOS)){
+            Map<String, List<UserBadgeListResultDTO>> groupByCustomer = userBadgeListResultDTOS.stream().collect(Collectors.groupingBy(UserBadgeListResultDTO::getCustomerId));
+            resultUserBadge.addAll(groupByCustomer.get(BadgeConstant.DEFAULT_CUSTOMER));
+            List<UserBadgeListResultDTO> badgeByCustomer = groupByCustomer.get(customerId);
+            if (!CollectionUtils.isEmpty(badgeByCustomer)) {
+                resultUserBadge.forEach(r -> {
+                    badgeByCustomer.forEach(b -> {
+                        if (r.getBadgeId().equals(b.getBadgeId())) {
+                            BeanUtils.copyProperties(b, r);
+                        }
+                    });
+                });
+                userBadgeRedis.setCustomerBadge(resultUserBadge, customerId);
+            }else {
+                userBadgeRedis.setCustomerBadge(resultUserBadge, customerId);
+            }
+        }
+    }
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml

@@ -0,0 +1,25 @@
+<?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="userId" column="USER_ID"/>
+        <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="replyUser" column="REPLY_USER"/>
+        <result property="replyTime" column="REPLY_TIME"/>
+        <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>

epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceImgDao.xml

@@ -0,0 +1,19 @@
+<?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="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>