Merge branch 'dev_personal_center' into dev_temp

# Conflicts:
#	epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@@ -40,12 +40,12 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 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.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Map;
 

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/MyPartIssuesFormDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/10 10:04 上午
+ */
+@Data
+public class MyPartIssuesFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 265005061427415836L;
+
+    public interface MyPartIssues{}
+
+    /**
+     * 用户ID
+     */
+    @NotBlank(message = "userId不能为空",groups = MyPartIssues.class)
+    private String userId;
+
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MyPartIssuesResultDTO.java

@@ -0,0 +1,37 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/10 9:50 上午
+ */
+@Data
+public class MyPartIssuesResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 2081387920547808112L;
+
+    private String issueId;
+
+    /**
+     * 建议
+     */
+    private String suggestion;
+
+    /**
+     * 议题标题
+     */
+    private String issueTitle;
+
+    /**
+     * 转议题时间
+     */
+    private Long shiftIssueTime;
+
+    /**
+     * 发表网格名称
+     */
+    private String topicReleaseGridName;
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@@ -249,24 +249,6 @@ public class CustomerAgencyController {
         return new Result<StaffInAgencyListResultDTO>().ok(customerAgencyService.staffInAgencyList(tokenDTO.getUserId()));
     }
 
-    /**
-     * @Description 对外接口-根据组织Id获取组织信息
-     * @author sun
-     **/
-    @PostMapping("agencyinfo")
-    Result<AgencyInfoResultDTO> agencyInfo(@RequestBody AgencyInfoFormDTO formDTO) {
-        return new Result<AgencyInfoResultDTO>().ok(customerAgencyService.agencyInfo(formDTO));
-    }
-
-    /**
-     * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
-     * @author sun
-     **/
-    @PostMapping("organizetree/{agencyId}")
-    Result<OrganizeTreeResultDTO> organizeTree(@PathVariable("agencyId") String agencyId) {
-        return new Result<OrganizeTreeResultDTO>().ok(customerAgencyService.organizeTree(agencyId));
-    }
-
     /**
      * @Description 对外接口，根据customerId返回Element UI中Tree结构的agency列表
      * @param map
@@ -297,4 +279,22 @@ public class CustomerAgencyController {
         }
         return new Result<Set<String>>().ok(customerAgencyService.getAgencyElementTree(customerId).getDefaultKeys());
     }
+
+    /**
+     * @Description 对外接口-根据组织Id获取组织信息
+     * @author sun
+     **/
+    @PostMapping("agencyinfo")
+    Result<AgencyInfoResultDTO> agencyInfo(@RequestBody AgencyInfoFormDTO formDTO) {
+        return new Result<AgencyInfoResultDTO>().ok(customerAgencyService.agencyInfo(formDTO));
+    }
+
+    /**
+     * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+     * @author sun
+     **/
+    @PostMapping("organizetree/{agencyId}")
+    Result<OrganizeTreeResultDTO> organizeTree(@PathVariable("agencyId") String agencyId) {
+        return new Result<OrganizeTreeResultDTO>().ok(customerAgencyService.organizeTree(agencyId));
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -176,6 +176,16 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      **/
     AgencyResultDTO selectAgencyByStaffId(@Param("staffId") String staffId);
 
+    /**
+     * @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);
+
     /**
      * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
      * @author sun
@@ -196,14 +206,4 @@ 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);
 }

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

@@ -214,6 +214,15 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      **/
     StaffInAgencyListResultDTO staffInAgencyList(String staffId);
 
+    /**
+     * @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);
+
     /**
      * @Description 对外接口-根据组织Id获取组织信息
      * @author sun
@@ -225,13 +234,4 @@ 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);
 }

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

@@ -994,6 +994,33 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return resultDTO;
     }
 
+    /**
+     * @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);
+            }
+        }
+    }
+
     /**
      * @Description 对外接口-根据组织Id获取组织信息
      * @author sun
@@ -1030,31 +1057,4 @@ 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);
-            }
-        }
-    }
-
 }

epmet-module/resi-mine/resi-mine-server/pom.xml

@@ -96,6 +96,11 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-issue-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/IssueController.java

@@ -0,0 +1,37 @@
+package com.epmet.modules.person.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.result.MyPartIssuesResultDTO;
+import com.epmet.modules.person.service.IssueService;
+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;
+
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/10 9:37 上午
+ */
+@RestController
+@RequestMapping("issue")
+public class IssueController {
+
+    @Autowired
+    private IssueService issueService;
+
+    /**
+     * @Description  个人中心-我参与的议题列表
+     * @Param tokenDto
+     * @author zxc
+     * @date 2020/11/10 10:01 上午
+     */
+    @PostMapping("my-part-issues")
+    public Result<List<MyPartIssuesResultDTO>> myPartIssues(@LoginUser TokenDto tokenDto){
+        return new Result<List<MyPartIssuesResultDTO>>().ok(issueService.myPartIssues(tokenDto));
+    }
+
+}

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/IssueService.java

@@ -0,0 +1,22 @@
+package com.epmet.modules.person.service;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.result.MyPartIssuesResultDTO;
+
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/10 9:59 上午
+ */
+public interface IssueService {
+
+    /**
+     * @Description  个人中心-我参与的议题列表
+     * @Param tokenDto
+     * @author zxc
+     * @date 2020/11/10 10:01 上午
+     */
+    List<MyPartIssuesResultDTO> myPartIssues(TokenDto tokenDto);
+
+}

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/IssueServiceImpl.java

@@ -0,0 +1,32 @@
+package com.epmet.modules.person.service.impl;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.form.MyPartIssuesFormDTO;
+import com.epmet.dto.result.MyPartIssuesResultDTO;
+import com.epmet.modules.person.service.IssueService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/10 10:00 上午
+ */
+@Service
+@Slf4j
+public class IssueServiceImpl implements IssueService {
+
+    /**
+     * @Description  个人中心-我参与的议题列表
+     * @Param tokenDto
+     * @author zxc
+     * @date 2020/11/10 10:01 上午
+     */
+    @Override
+    public List<MyPartIssuesResultDTO> myPartIssues(TokenDto tokenDto) {
+        MyPartIssuesFormDTO form = new MyPartIssuesFormDTO();
+        form.setUserId(tokenDto.getUserId());
+        return null;
+    }
+}

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

@@ -98,6 +98,11 @@ public class UserAdviceDTO implements Serializable {
      */
 	private String adviceType;
 
+    /**
+     * 问题时间
+     */
+	private Date adviceTime;
+
     /**
      * 回复内容
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeAuditFormDTO.java

@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -14,7 +15,9 @@ import java.io.Serializable;
 @Data
 public class BadgeAuditFormDTO implements Serializable {
 	private static final long serialVersionUID = 2209535364555130964L;
+	@NotBlank(message = "申请记录Id不能为空")
 	private String recordId;
+	@NotBlank(message = "审核结果不能为空")
 	private String auditStatus;
 	private String auditRemark;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeFormDTO.java

@@ -2,6 +2,7 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -12,6 +13,9 @@ import java.io.Serializable;
 @Data
 public class BadgeFormDTO implements Serializable {
 	private static final long serialVersionUID = 9156247659994638103L;
+	public interface ManageGroup {}
+	public interface AuditGroup {}
+	@NotBlank(message = "徽章id不能为空", groups = {ManageGroup.class})
 	private String badgeId;
 	/**
 	 * 页码
@@ -24,5 +28,6 @@ public class BadgeFormDTO implements Serializable {
 	/**
 	 * 网格Id
 	 */
+	@NotBlank(message = "网格id不能为空", groups = {AuditGroup.class})
 	private String gridId;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationDetailFormDTO.java

@@ -23,7 +23,7 @@ public class CertificationDetailFormDTO implements Serializable {
     private String badgeId;
 
     /**
-     * 客户ID
+     * 审核记录ID
      */
-    private String userId;
+    private String recordId;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditBadgeFormDTO.java

@@ -16,6 +16,7 @@ import java.util.List;
 @Data
 public class EditBadgeFormDTO implements Serializable {
 	private static final long serialVersionUID = 1578890423002035200L;
+	@NotBlank(message = "徽章ID不能为空")
 	private String badgeId;
 	/**
 	 * 徽章名称

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SubmitAdviceFormDTO.java

@@ -0,0 +1,51 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: liushaowen
+ * @date: 2020/11/10 10:42
+ */
+@Data
+public class SubmitAdviceFormDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+    @NotBlank(message = "客户id不能为空")
+    private String customerId;
+
+    /**
+     * 网格id
+     */
+    @NotBlank(message = "网格id不能为空")
+    private String gridId;
+
+    /**
+     * 建议内容
+     */
+    @NotBlank(message = "建议内容不能为空")
+    private String adviceContent;
+
+    /**
+     * 电话号码可为空 存*，不为空需校验
+     */
+    private String phone;
+
+    /**
+     * 问题类型，可为空 存*,gov为政府问题，software为软件问题
+     */
+
+    private String adviceType;
+
+    /**
+     * 建议图片
+     */
+    private List<String> imgList;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditRecordResultDTO.java

@@ -40,4 +40,9 @@ public class BadgeAuditRecordResultDTO implements Serializable {
 	 * 用户名
 	 */
 	private String auditStatus;
+
+	/**
+	 * 用户头像
+	 */
+	private String userAvatar;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditingResultDTO.java

@@ -40,4 +40,9 @@ public class BadgeAuditingResultDTO implements Serializable {
 	 */
 	private Long createTime;
 
+	/**
+	 * 用户头像
+	 */
+	private String userAvatar;
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -221,11 +221,6 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", formDTO);
     }
 
-    @Override
-    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);
@@ -250,4 +245,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result openedOrClosed(OpenedOrClosedFormDTO openedOrClosedFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "openedOrClosed", openedOrClosedFormDTO);
     }
+
+    @Override
+    public Result<BasicInfoResultDTO> getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", fromDTO);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java

@@ -68,6 +68,7 @@ public class BadgeController {
 	 */
 	@PostMapping("detail")
 	public Result<BadgeDetailResultDTO> detail(@LoginUser TokenDto tokenDto, @RequestBody BadgeFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, BadgeFormDTO.ManageGroup.class);
 		BadgeDetailResultDTO result = badgeService.detail(tokenDto, formDTO);
 		return new Result<BadgeDetailResultDTO>().ok(result);
 	}
@@ -97,6 +98,7 @@ public class BadgeController {
 	 */
 	@PostMapping("delete")
 	public Result delete(@LoginUser TokenDto tokenDto, @RequestBody BadgeFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, BadgeFormDTO.ManageGroup.class);
 		badgeService.deleteBadge(tokenDto, formDTO);
 		return new Result();
 	}
@@ -116,6 +118,7 @@ public class BadgeController {
 	 */
 	@PostMapping("auditinglist")
 	public Result<List<BadgeAuditingResultDTO>> auditingList(@LoginUser TokenDto tokenDto, @RequestBody BadgeFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, BadgeFormDTO.AuditGroup.class);
 		List<BadgeAuditingResultDTO> result = badgeService.auditingList(tokenDto, formDTO);
 		return new Result<List<BadgeAuditingResultDTO>>().ok(result);
 	}
@@ -130,6 +133,7 @@ public class BadgeController {
 	 */
 	@PostMapping("auditrecord")
 	public Result<List<BadgeAuditRecordResultDTO>> auditRecord(@LoginUser TokenDto tokenDto, @RequestBody BadgeFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, BadgeFormDTO.AuditGroup.class);
 		List<BadgeAuditRecordResultDTO> result = badgeService.auditRecord(tokenDto, formDTO);
 		return new Result<List<BadgeAuditRecordResultDTO>>().ok(result);
 	}
@@ -144,21 +148,8 @@ public class BadgeController {
 	 */
 	@PostMapping("audit")
 	public Result audit(@LoginUser TokenDto tokenDto, @RequestBody BadgeAuditFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO);
 		badgeService.audit(tokenDto, formDTO);
 		return new Result();
 	}
-
-	@Autowired
-	private UserBadgeRedis redis;
-	@PostMapping("compensation-mechanism")
-	public Result compensationMechanism(@RequestParam("userId")String userId,@RequestParam("customerId")String customerId,@RequestParam("b1")String b1,
-										@RequestParam("b2")String b2){
-		redis.pushOrRemoveUserBadge4List(userId,b1,customerId);
-		redis.pushOrRemoveUserBadge4List(userId,b1,customerId);
-		redis.pushOrRemoveUserBadge4List(userId,b1,customerId);
-		redis.pushOrRemoveUserBadge4List(userId,b2,customerId);
-		redis.batchClearUserBadgeCache(customerId);
-		redis.obtainUserBadge2List(userId,customerId);
-		return new Result();
-	}
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java

@@ -30,6 +30,7 @@ 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.form.SubmitAdviceFormDTO;
 import com.epmet.dto.result.AdviceDetailResultDTO;
 import com.epmet.dto.result.AdviceListResultDTO;
 import com.epmet.dto.result.MyAdviceListResultDTO;
@@ -42,6 +43,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 
 /**
@@ -170,4 +172,18 @@ public class UserAdviceController {
         }
         return new Result<List<MyAdviceListResultDTO>>().ok(userAdviceService.myAdviceList(pageSize,pageNo,loginUserUtil.getLoginUserId()));
     }
+
+    @PostMapping("submitadvice")
+    public Result submitAdvice(@RequestBody SubmitAdviceFormDTO dto){
+        ValidatorUtils.validateEntity(dto);
+        if (StringUtils.isNotBlank(dto.getPhone())){
+            if (!Pattern.matches("^1[3456789]\\d{9}$",dto.getPhone())){
+                throw new RenException("手机号格式错误");
+            }
+        }else {
+            dto.setPhone("*");
+        }
+        userAdviceService.submitAdvice(dto,loginUserUtil.getLoginUserId());
+        return new Result();
+    }
 }

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

@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.UserAdviceDTO;
 import com.epmet.dto.result.MyAdviceListResultDTO;
 import com.epmet.entity.UserAdviceEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -41,4 +42,6 @@ public interface UserAdviceDao extends BaseDao<UserAdviceEntity> {
     List<MyAdviceListResultDTO> myAdviceList(@Param("pageSize") int pageSize,
                                              @Param("pageNo") int pageNo,
                                              @Param("userId") String loginUserId);
+
+    int saveUserAdvice(UserAdviceDTO dto);
 }

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

@@ -86,7 +86,7 @@ public interface UserBadgeDao {
      * @author zxc
      * @date 2020/11/4 4:09 下午
      */
-    CertificationDetailResultDTO selectBadgeAuthRecord(@Param("userId")String userId, @Param("badgeId")String badgeId);
+    CertificationDetailResultDTO selectBadgeAuthRecord(@Param("userId")String userId, @Param("badgeId")String badgeId,@Param("recordId")String recordId);
 
     /**
      * @Description  个人中心-查询徽章要显示的认证信息字段

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

@@ -18,12 +18,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.redis.connection.RedisConnection;
-import org.springframework.data.redis.connection.StringRedisConnection;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -189,5 +188,19 @@ public class UserBadgeRedis {
 
         }
 
+        public List<String> pipelinedReturnKeys(String customerId){
+            List<String> list = redisTemplate.executePipelined(new RedisCallback<List<String>>() {
+                @Nullable
+                @Override
+                public List<String> doInRedis(RedisConnection connection) throws DataAccessException {
+                    connection.openPipeline();
+                    Set<byte[]> keys = connection.keys(redisTemplate.getKeySerializer().serialize(UserRedisKeys.getResiUserBadgeKey(customerId, null)));
+                    return null;
+                }
+            },redisTemplate.getKeySerializer());
+
+            return list;
+        }
+
     }
 

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

@@ -22,6 +22,7 @@ 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.form.SubmitAdviceFormDTO;
 import com.epmet.dto.result.AdviceDetailResultDTO;
 import com.epmet.dto.result.AdviceListResultDTO;
 import com.epmet.dto.result.MyAdviceListResultDTO;
@@ -136,4 +137,14 @@ public interface UserAdviceService extends BaseService<UserAdviceEntity> {
      * @Date 2020/11/9 17:39
      */
     List<MyAdviceListResultDTO> myAdviceList(int pageSize, int pageNo, String loginUserId);
+
+    /**
+     * @Description 居民端-回复建议
+     * @param dto
+     * @param loginUserId
+     * @return void
+     * @Author liushaowen
+     * @Date 2020/11/10 10:57
+     */
+    void submitAdvice(SubmitAdviceFormDTO dto, String loginUserId);
 }

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

@@ -17,6 +17,7 @@
 
 package com.epmet.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -25,9 +26,11 @@ 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.exception.ValidateException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.BadgeConstant;
 import com.epmet.constant.BadgeMessageConstant;
 import com.epmet.constant.UserConstant;
@@ -42,9 +45,11 @@ 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.EpmetMessageOpenFeignClient;
 import com.epmet.feign.MessageFeignClient;
 import com.epmet.redis.UserBadgeRedis;
 import com.epmet.service.*;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +65,7 @@ import java.util.*;
  * @since v1.0.0 2020-11-03
  */
 @Service
+@Slf4j
 public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> implements BadgeService {
 
     @Autowired
@@ -74,6 +80,9 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
     private ResiUserBadgeService resiUserBadgeService;
     @Autowired
     private MessageFeignClient messageFeignClient;
+    @Autowired
+	private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+
 
 
     @Override
@@ -290,7 +299,6 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
     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;
     }
 
@@ -307,7 +315,6 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
     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;
     }
 
@@ -322,6 +329,11 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
      */
     @Override
     public void audit(TokenDto tokenDto, BadgeAuditFormDTO formDTO) {
+        if(BadgeConstant.REJECTED.equals(formDTO.getAuditStatus())) {
+            if (StringUtils.isEmpty(formDTO.getAuditRemark())) {
+                throw new ValidateException(EpmetErrorCode.CUSTOMER_VALIDATE_ERROR.getCode(), "驳回理由不能为空");
+            }
+        }
         UserBadgeCertificateRecordDTO dto  = userBadgeCertificateRecordService.get(formDTO.getRecordId());
         BadgeDetailResultDTO detail = baseDao.selectDetail(dto.getCustomerId(), dto.getBadgeId());
         dto.setAuditStatus(formDTO.getAuditStatus());
@@ -329,48 +341,71 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
         dto.setStaffId(tokenDto.getUserId());
         dto.setIsLast(BadgeConstant.YES);
         dto.setAuditTime(new Date());
-
         userBadgeCertificateRecordService.update(dto);
 
+        List<UserMessageFormDTO> msgList = new ArrayList<>();
+		List<WxSubscribeMessageFormDTO> wxmpMsgList = new ArrayList<>();
+        if(BadgeConstant.APPROVED.equals(formDTO.getAuditStatus())) {
+
             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.setIsOpened(NumConstant.ONE);
             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);
+            badgeRedis.pushOrRemoveUserBadge4List(dto.getUserId(),dto.getBadgeId(),dto.getCustomerId());
             //通知
+			String msg = String.format(BadgeMessageConstant.APPROVED_MSG, detail.getBadgeName());
             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.setMessageContent(msg);
             messageFormDTO.setReadFlag(Constant.UNREAD);
+            //微信消息
+			WxSubscribeMessageFormDTO wxmp = new WxSubscribeMessageFormDTO();
+			wxmp.setCustomerId(dto.getCustomerId());
+			wxmp.setClientType(UserConstant.APP_RESI);
+			wxmp.setUserId(dto.getUserId());
+			wxmp.setBehaviorType("徽章消息");
+			wxmp.setMessageContent(msg);
+			wxmp.setMessageTime(new Date());
+			wxmp.setGridId(dto.getGridId());
+			wxmpMsgList.add(wxmp);
         } else {
             //通知
+			String msg = String.format(BadgeMessageConstant.REJECTED_MSG, detail.getBadgeName(), formDTO.getAuditRemark());
             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.setMessageContent(msg);
             messageFormDTO.setReadFlag(Constant.UNREAD);
             msgList.add(messageFormDTO);
+			//微信消息
+			WxSubscribeMessageFormDTO wxmp = new WxSubscribeMessageFormDTO();
+			wxmp.setCustomerId(dto.getCustomerId());
+			wxmp.setClientType(UserConstant.APP_RESI);
+			wxmp.setUserId(dto.getUserId());
+			wxmp.setBehaviorType("徽章消息");
+			wxmp.setMessageContent(msg);
+			wxmp.setMessageTime(new Date());
+			wxmp.setGridId(dto.getGridId());
+			wxmpMsgList.add(wxmp);
         }
         messageFeignClient.saveUserMessageList(msgList);
+		log.info("徽章消息，开始推送微信订阅消息");
+		Result result = epmetMessageOpenFeignClient.sendWxSubscribeMessage(wxmpMsgList);
+		if (!result.success()) {
+			log.error("徽章消息，发送微信订阅消息失败" + JSON.toJSONString(result));
+		}
     }
 
     @Override

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

@@ -37,17 +37,22 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.UserAdviceConstant;
 import com.epmet.dao.UserAdviceDao;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.CustomerDTO;
 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.dto.result.AdviceListResultDTO;
-import com.epmet.dto.result.MyAdviceListResultDTO;
+import com.epmet.dto.form.SubmitAdviceFormDTO;
+import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.UserAdviceEntity;
 import com.epmet.entity.UserAdviceImgEntity;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.feign.OperCrmOpenFeignClient;
 import com.epmet.redis.UserAdviceRedis;
 import com.epmet.service.UserAdviceImgService;
 import com.epmet.service.UserAdviceService;
+import com.epmet.service.UserResiInfoService;
 import io.jsonwebtoken.lang.Collections;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -76,6 +81,15 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
     @Autowired
     private UserAdviceImgService userAdviceImgService;
 
+    @Autowired
+    private OperCrmOpenFeignClient operCrmOpenFeignClient;
+
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
+    @Autowired
+    private UserResiInfoService userResiInfoService;
+
     @Value("${openapi.scan.server.url}")
     private String scanApiUrl;
     @Value("${openapi.scan.method.textSyncScan}")
@@ -293,6 +307,85 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
         return baseDao.myAdviceList(pageSize, pageNo, loginUserId);
     }
 
+    /**
+     * @param dto
+     * @param loginUserId
+     * @return void
+     * @Description 居民端-回复建议
+     * @Author liushaowen
+     * @Date 2020/11/10 10:57
+     */
+    @Override
+    public void submitAdvice(SubmitAdviceFormDTO dto, String loginUserId) {
+        //审核图片文字
+        auditText(dto.getAdviceContent());
+        auditPic(dto.getImgList());
+        UserAdviceDTO userAdviceDTO = new UserAdviceDTO();
+        BeanUtils.copyProperties(dto,userAdviceDTO);
+
+        //获取customerName
+        CustomerDTO customerDTO = new CustomerDTO();
+        customerDTO.setId(dto.getCustomerId());
+        Result<CustomerDTO> customerInfo = operCrmOpenFeignClient.getCustomerInfo(customerDTO);
+        if (customerInfo.success()){
+            userAdviceDTO.setCustomerName(customerInfo.getData().getCustomerName());
+        }else {
+            logger.error("customerId:{},获取customerName失败",dto.getCustomerId());
+        }
+        //获取gridName,agencyId
+        Result<GridInfoResultDTO> gridInfoResultDTOResult = govOrgOpenFeignClient.queryGridInfo(dto.getGridId());
+        if (gridInfoResultDTOResult.success()){
+            userAdviceDTO.setGridName(gridInfoResultDTOResult.getData().getGridName());
+            userAdviceDTO.setAgencyId(gridInfoResultDTOResult.getData().getParentAgencyId());
+            //获取agencyName
+            Result<CustomerAgencyDTO> agencyById = govOrgOpenFeignClient.getAgencyById(gridInfoResultDTOResult.getData().getParentAgencyId());
+            if (agencyById.success()){
+                userAdviceDTO.setAgencyName(agencyById.getData().getAllParentName());
+            }else {
+                logger.error("agencyId:{},获取组织详情失败",gridInfoResultDTOResult.getData().getParentAgencyId());
+            }
+        }else {
+            logger.error("gridId:{},获取网格详情失败",dto.getGridId());
+        }
+
+        //获取userName,regPhone
+        UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
+        userResiInfoFormDTO.setUserId(loginUserId);
+        userResiInfoFormDTO.setCustomerId(dto.getCustomerId());
+        Result<UserResiInfoResultDTO> userResiInfoDTO = userResiInfoService.getUserResiInfoDTO(userResiInfoFormDTO);
+        if (userResiInfoDTO.success()){
+            userAdviceDTO.setUserId(loginUserId);
+            userAdviceDTO.setUserName(userResiInfoDTO.getData().getSurname()+userResiInfoDTO.getData().getName());
+            userAdviceDTO.setRegPhone(userResiInfoDTO.getData().getRegMobile());
+        }else {
+            logger.error("userId:{}，获取user注册信息失败",loginUserId);
+        }
+        //设置AdviceTime
+        userAdviceDTO.setAdviceTime(new Date());
+        //设置adviceType
+        if (StringUtils.isBlank(dto.getAdviceType())){
+            userAdviceDTO.setAdviceType("*");
+        }
+        baseDao.saveUserAdvice(userAdviceDTO);
+        //如果imgList不为空，插入advice_img表
+        List<String> govImgList = dto.getImgList();
+        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(userAdviceDTO.getId());
+                entity.setType("resi");
+                userAdviceImgEntities.add(entity);
+            }
+            userAdviceImgService.insertBatch(userAdviceImgEntities);
+        }
+    }
+
     private void auditText(String text) {
         TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
         TextTaskDTO taskDTO = new TextTaskDTO();

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

@@ -212,7 +212,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
 
     /**
      * @Description  个人中心-获取徽章认证页面详情
-     * 先判断 userId存在不，不存在从tokenDto获取【工作端和居民端合用一个接口】
+     * 先判断 recordId存在不，不存在是居民端，反之，工作端【工作端和居民端合用一个接口】
      * @Param tokenDto
      * @Param certificationDetailFormDTO
      * @author zxc
@@ -220,10 +220,10 @@ public class UserBadgeServiceImpl implements UserBadgeService {
      */
     @Override
     public CertificationDetailResultDTO certificationDetail(TokenDto tokenDto, CertificationDetailFormDTO certificationDetailFormDTO) {
-        if (StringUtils.isEmpty(certificationDetailFormDTO.getUserId())){
-            certificationDetailFormDTO.setUserId(tokenDto.getUserId());
+        if (StringUtils.isNotBlank(certificationDetailFormDTO.getRecordId())){
+            return userBadgeDao.selectBadgeAuthRecord(null, certificationDetailFormDTO.getBadgeId(),certificationDetailFormDTO.getRecordId());
         }
-        return userBadgeDao.selectBadgeAuthRecord(certificationDetailFormDTO.getUserId(), certificationDetailFormDTO.getBadgeId());
+        return userBadgeDao.selectBadgeAuthRecord(tokenDto.getUserId(), certificationDetailFormDTO.getBadgeId(),certificationDetailFormDTO.getRecordId());
     }
 
 
@@ -268,6 +268,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         if (CollectionUtils.isEmpty(userBadgeListResultDTOS)){
             throw new RenException("客户徽章缓存初始化未查到数据");
         }
+        userBadgeRedis.batchClearUserBadgeCache(customerId);
         userBadgeRedis.setCustomerBadge(userBadgeListResultDTOS, customerId);
     }
 

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

@@ -147,6 +147,7 @@
             badge.BADGE_ICON,
             ubcr.USER_ID,
             ubi.REAL_NAME AS "userName",
+            ubi.HEAD_IMG_URL AS userAvatar,
             unix_timestamp(ubcr.CREATED_TIME) AS "createTime"
         FROM
             user_badge_certificate_record  ubcr
@@ -181,6 +182,7 @@
             ubcr.USER_ID,
             ubcr.AUDIT_STATUS,
             ubi.REAL_NAME AS "userName",
+            ubi.HEAD_IMG_URL AS userAvatar,
             unix_timestamp(ubcr.CREATED_TIME) AS "createTime"
         FROM
             user_badge_certificate_record  ubcr

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

@@ -64,4 +64,49 @@
         from user_advice_img
         where del_flag = 0 and advice_Id = #{id} and type = 'resi'
     </select>
+
+    <insert id="saveUserAdvice" parameterType="com.epmet.entity.UserAdviceEntity">
+        <selectKey resultType="String" keyProperty="id" order="BEFORE">
+            select md5(replace(UUID(),'-',''))
+        </selectKey>
+        insert into user_advice(
+          id,
+          customer_id,
+          customer_name,
+          agency_id,
+          agency_name,
+          grid_id,
+          grid_name,
+          user_id,
+          user_name,
+          reg_phone,
+          advice_content,
+          phone,
+          advice_time,
+          advice_type,
+          del_flag,
+          revision,
+          created_by,
+          created_time,
+          updated_by,
+          updated_time
+        )
+        values (
+          #{id},
+          #{customerId},
+          #{customerName},
+          #{agencyId},
+          #{agencyName},
+          #{gridId},
+          #{gridName},
+          #{userId},
+          #{userName},
+          #{regPhone},
+          #{adviceContent},
+          #{phone},
+          #{adviceTime},
+          #{adviceType},
+          0,0,#{userId},#{adviceTime},#{userId},#{adviceTime}
+        )
+    </insert>
 </mapper>

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

@@ -105,9 +105,14 @@
             user_badge_certificate_record
         WHERE
             DEL_FLAG = 0
-            AND IS_LAST = 'yes'
             AND BADGE_ID = #{badgeId}
+            <if test="userId != null and userId != '' ">
                 AND USER_ID = #{userId}
+                AND IS_LAST = 'yes'
+            </if>
+            <if test="recordId != null and recordId != ''">
+                AND ID = #{recordId}
+            </if>
     </select>
 
     <!-- 个人中心-查询徽章要显示的认证信息字段 -->