Merge branch 'dev_personal_center' into dev_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java

@@ -166,6 +166,14 @@ public class RedisUtils {
         redisTemplate.opsForHash().delete(key, fields);
     }
 
+    public void rightPush(String key, Object value, long expire){
+        redisTemplate.opsForList().rightPush(key, value);
+
+        if (expire != NOT_EXPIRE) {
+            expire(key, expire);
+        }
+    }
+
     public void leftPush(String key, Object value) {
         leftPush(key, value, DEFAULT_EXPIRE);
     }

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

@@ -269,13 +269,14 @@ public class CustomerAgencyController {
 
     /**
      * @Description 对外接口，根据customerId返回Element UI中Tree结构的agency列表
-     * @param customerId
+     * @param map
      * @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){
+    public Result<List<AgencyElementTreeResultDTO.Agency>> getAgencyElementTreeList(@RequestBody Map<String,String> map){
+        String customerId = map.get("customerId");
         if (StringUtils.isBlank(customerId)){
             throw new RenException("customerId不能为空");
         }
@@ -283,13 +284,14 @@ public class CustomerAgencyController {
     }
     /**
      * @Description 对外接口，根据customerId返回Element UI中Tree结构的agency keys
-     * @param customerId
+     * @param map
      * @return com.epmet.commons.tools.utils.Result
      * @Author liushaowen
      * @Date 2020/11/6 13:51
      */
     @PostMapping("getagencyelementtreekeys")
-    public Result<Set<String>> getAgencyElementTreeKeys(String customerId){
+    public Result<Set<String>> getAgencyElementTreeKeys(@RequestBody Map<String,String> map){
+        String customerId = map.get("customerId");
         if (StringUtils.isBlank(customerId)){
             throw new RenException("customerId不能为空");
         }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/badege/controller/BadgeController.java → epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/BadgeController.java

@@ -1,11 +1,11 @@
-package com.epmet.modules.badege.controller;
+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.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.OpenedOrClosedFormDTO;
-import com.epmet.modules.badege.service.BadgeService;
+import com.epmet.modules.person.service.BadgeService;
 import com.epmet.resi.mine.dto.from.BadgeListFormDTO;
 import com.epmet.dto.form.CertificationAddFormDTO;
 import com.epmet.resi.mine.dto.from.OperListFormDTO;

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/badege/service/BadgeService.java → epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/BadgeService.java

@@ -1,4 +1,4 @@
-package com.epmet.modules.badege.service;
+package com.epmet.modules.person.service;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;

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

@@ -1,4 +1,4 @@
-package com.epmet.modules.badege.service.impl;
+package com.epmet.modules.person.service.impl;
 
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -10,7 +10,7 @@ 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.modules.person.service.BadgeService;
 import com.epmet.resi.mine.dto.from.BadgeListFormDTO;
 import com.epmet.dto.form.CertificationAddFormDTO;
 import com.epmet.resi.mine.dto.from.OperListFormDTO;

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

@@ -6,7 +6,7 @@ import java.io.Serializable;
 import java.util.Objects;
 
 /**
- * @Description 用户-徽章缓存单元
+ * @Description 用户-徽章缓存单元(专为redis操作提供)  尽量不要使用这个DTO,因为重写了hashcode和equals！！！！！！！
  * @ClassName UserBadgeUnitFormDTO
  * @Auth wangc
  * @Date 2020-11-05 10:00

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

@@ -0,0 +1,30 @@
+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/9 17:21
+ */
+@Data
+public class MyAdviceListResultDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String adviceContent;
+
+    private List<String> imgList;
+
+    @JsonFormat(pattern = "yyyy/MM/dd", timezone = "GMT+8")
+    private Date adviceTime;
+
+    private String replyContent;
+
+    @JsonFormat(pattern = "yyyy/MM/dd", timezone = "GMT+8")
+    private Date replyTime;
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRedisKeys.java

@@ -1,5 +1,7 @@
 package com.epmet.constant;
 
+import org.apache.commons.lang3.StringUtils;
+
 /**
  * @Description
  * @ClassName UserRedisKeys
@@ -32,5 +34,5 @@ public class UserRedisKeys {
      * @date 2020.11.05 13:34
     */
     public static String getResiUserBadgeKey(String customerId,String userId){
-        return rootPrefix.concat("badge:user:").concat(customerId).concat(":").concat(userId);}
+        return rootPrefix.concat("badge:user:").concat(customerId).concat(":").concat( StringUtils.isBlank(userId) ? "*" : userId );}
 }

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

@@ -12,12 +12,10 @@ 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.redis.UserBadgeRedis;
 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.*;
-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;
 
@@ -150,4 +148,17 @@ public class BadgeController {
 		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

@@ -32,6 +32,7 @@ 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.excel.UserAdviceExcel;
 import com.epmet.service.UserAdviceService;
 import org.apache.commons.lang3.StringUtils;
@@ -60,19 +61,19 @@ public class UserAdviceController {
     private LoginUserUtil loginUserUtil;
 
     @GetMapping("page")
-    public Result<PageData<UserAdviceDTO>> page(@RequestParam Map<String, Object> params){
+    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){
+    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){
+    public Result save(@RequestBody UserAdviceDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         userAdviceService.save(dto);
@@ -80,7 +81,7 @@ public class UserAdviceController {
     }
 
     @PutMapping
-    public Result update(@RequestBody UserAdviceDTO dto){
+    public Result update(@RequestBody UserAdviceDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         userAdviceService.update(dto);
@@ -88,7 +89,7 @@ public class UserAdviceController {
     }
 
     @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         userAdviceService.delete(ids);
@@ -101,30 +102,72 @@ public class UserAdviceController {
         ExcelUtils.exportExcelToTarget(response, null, list, UserAdviceExcel.class);
     }
 
+    /**
+     * @Description 运营-回复建议
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author liushaowen
+     * @Date 2020/11/10 9:34
+     */
     @PostMapping("replyadvice")
-    public Result replyAdvice(@RequestBody ReplyAdviceFormDTO dto){
+    public Result replyAdvice(@RequestBody ReplyAdviceFormDTO dto) {
         ValidatorUtils.validateEntity(dto);
-        userAdviceService.replyAdvice(dto,loginUserUtil.getLoginUserId());
+        userAdviceService.replyAdvice(dto, loginUserUtil.getLoginUserId());
         return new Result();
     }
 
+    /**
+     * @Description 运营端-建议详情
+     * @param map
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author liushaowen
+     * @Date 2020/11/10 9:33
+     */
     @PostMapping("advicedetail")
-    public Result adviceDetail(String adviceId){
+    public Result adviceDetail(@RequestBody Map<String,String> map) {
-        if (StringUtils.isBlank(adviceId)){
+        String adviceId = map.get("adviceId");
+        if (StringUtils.isBlank(adviceId)) {
             throw new RenException("adviceId不能为空");
         }
         return new Result<AdviceDetailResultDTO>().ok(userAdviceService.adviceDetail(adviceId));
     }
 
+    /**
+     * @Description 运营端-建议列表
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData<com.epmet.dto.result.AdviceListResultDTO>>
+     * @Author liushaowen
+     * @Date 2020/11/10 9:32
+     */
     @PostMapping("advicelist")
-    public Result<PageData<AdviceListResultDTO>> adviceList(@RequestBody AdviceListFormDTO dto){
+    public Result<PageData<AdviceListResultDTO>> adviceList(@RequestBody AdviceListFormDTO dto) {
         ValidatorUtils.validateEntity(dto);
-        if (dto.getStartTime()!=null && dto.getEndTime()!=null){
+        if (dto.getStartTime() != null && dto.getEndTime() != null) {
-            if (dto.getStartTime().after(dto.getEndTime())){
+            if (dto.getStartTime().after(dto.getEndTime())) {
                 throw new RenException("开始时间不能大于结束时间");
             }
         }
         PageData<AdviceListResultDTO> page = userAdviceService.adviceList(dto);
         return new Result<PageData<AdviceListResultDTO>>().ok(page);
     }
+
+    /**
+     * @Description 居民端-我的建议列表
+     * @param map ->pageSize,pageNo
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.MyAdviceListResultDTO>>
+     * @Author liushaowen
+     * @Date 2020/11/9 17:35
+     */
+    @PostMapping("myadvicelist")
+    public Result<List<MyAdviceListResultDTO>> myAdviceList(@RequestBody Map<String,Integer> map) {
+        int pageSize = map.get("pageSize");
+        int pageNo = map.get("pageNo");
+        if (pageSize == 0){
+            pageSize = 10;
+        }
+        if (pageNo == 0){
+            pageNo = 1;
+        }
+        return new Result<List<MyAdviceListResultDTO>>().ok(userAdviceService.myAdviceList(pageSize,pageNo,loginUserUtil.getLoginUserId()));
+    }
 }

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

@@ -18,10 +18,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.MyAdviceListResultDTO;
 import com.epmet.entity.UserAdviceEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * user_advice
  *
@@ -34,4 +37,8 @@ public interface UserAdviceDao extends BaseDao<UserAdviceEntity> {
                      @Param("replyContent") String replyContent,
                      @Param("govContent") String govContent,
                      @Param("replyUserId") String loginUserId);
+
+    List<MyAdviceListResultDTO> myAdviceList(@Param("pageSize") int pageSize,
+                                             @Param("pageNo") int pageNo,
+                                             @Param("userId") String loginUserId);
 }

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

@@ -4,6 +4,7 @@ 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.form.UserBadgeUnitFormDTO;
 import com.epmet.dto.result.AuthFieldResultDTO;
 import com.epmet.dto.result.CertificationDetailResultDTO;
 import com.epmet.dto.result.UserBadgeListResultDTO;
@@ -101,4 +102,14 @@ public interface UserBadgeDao {
      * @date 2020/11/4 6:04 下午
      */
     void updateIsOpen(OpenedOrClosedFormDTO openedOrClosedFormDTO);
+    
+    /**
+     * @Description 查找用户全部的显示徽章(排序)
+     * @param userId
+     * @param customerId
+     * @return java.util.List<com.epmet.dto.form.UserBadgeUnitFormDTO>
+     * @author wangc
+     * @date 2020.11.09 14:14
+    */
+    List<UserBadgeUnitFormDTO> selectUserSortedBadge(@Param("userId")String userId,@Param("customerId")String customerId);
 }

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

@@ -16,10 +16,17 @@ 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.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.stereotype.Component;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 import static com.epmet.commons.tools.redis.RedisUtils.MINUTE_THIRTY_EXPIRE;
 
@@ -37,6 +44,8 @@ public class UserBadgeRedis {
     private BadgeDao badgeDao;
     @Autowired
     private UserBadgeService badgeService;
+    @Autowired
+    private RedisTemplate redisTemplate;
 
     /**
      * @Description 获取客户徽章信息
@@ -101,8 +110,23 @@ public class UserBadgeRedis {
      * @date 2020.11.05 13:26
      */
     public List<UserBadgeUnitFormDTO> obtainUserBadge2List(String userId,String customerId) {
-        //TODO  补偿
+        List<UserBadgeUnitFormDTO> cache =
-        return redisUtils.lrange(UserRedisKeys.getResiUserBadgeKey(customerId,userId), NumConstant.ZERO, NumConstant.ONE_NEG, UserBadgeUnitFormDTO.class);
+        redisUtils.lrange(UserRedisKeys.getResiUserBadgeKey(customerId,userId), NumConstant.ZERO, NumConstant.ONE_NEG, UserBadgeUnitFormDTO.class);
+        if(!CollectionUtils.isEmpty(cache)) return cache;
+        //补偿
+        cache = badgeService.getUserSortedBadge(userId,customerId);
+        if(CollectionUtils.isEmpty(cache)) return cache;
+        final List<UserBadgeUnitFormDTO> sortedBadges = cache;
+        redisTemplate.executePipelined((RedisCallback<List<UserBadgeUnitFormDTO>>) connection ->{
+            sortedBadges.forEach(badge -> {
+
+                connection.listCommands().rPush(UserRedisKeys.getResiUserBadgeKey(customerId, userId).getBytes(),
+                        redisTemplate.getValueSerializer().serialize(badge));
+            });
+            return null;
+        });
+
+        return cache;
     }
 
     /**
@@ -146,5 +170,24 @@ public class UserBadgeRedis {
             return NumConstant.ONE;
         }
 
+
+        /**
+         * @Description 批量清除用户徽章信息，用处：在客户取消点亮某个徽章后，批量清除该客户下所有用户的徽章缓存，当需要查取时再次初始化进缓存中
+         * @param customerId
+         * @return void
+         * @author wangc
+         * @date 2020.11.09 10:02
+        */
+        public void batchClearUserBadgeCache(String customerId){
+            Set<String> key = redisUtils.keys(UserRedisKeys.getResiUserBadgeKey(customerId, null));
+            if(CollectionUtils.isEmpty(key)) return;
+            final Set<String> keys = key;
+            redisTemplate.executePipelined((RedisCallback<String>) connection ->{
+                    keys.forEach( ser -> {connection.del(redisTemplate.getKeySerializer().serialize(ser));});
+                return null;
+            });
+
+        }
+
     }
 

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

@@ -24,6 +24,7 @@ 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.entity.UserAdviceEntity;
 
 import java.util.List;
@@ -124,4 +125,15 @@ public interface UserAdviceService extends BaseService<UserAdviceEntity> {
      * @Date 2020/11/9 10:41
      */
     PageData<AdviceListResultDTO> adviceList(AdviceListFormDTO dto);
+
+    /**
+     * @Description 居民端-我的建议列表
+     * @param pageSize
+     * @param pageNo
+     * @param loginUserId
+     * @return java.util.List<com.epmet.dto.result.MyAdviceListResultDTO>
+     * @Author liushaowen
+     * @Date 2020/11/9 17:39
+     */
+    List<MyAdviceListResultDTO> myAdviceList(int pageSize, int pageNo, String loginUserId);
 }

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

@@ -81,4 +81,14 @@ public interface UserBadgeService {
      */
     void reloadCustomerBadge(String customerId);
 
+    /**
+     * @Description 得到用户全部的显示徽章(排序)
+     * @param userId
+     * @param customerId
+     * @return java.util.List<com.epmet.dto.form.UserBadgeUnitFormDTO>
+     * @author wangc
+     * @date 2020.11.09 13:45
+    */
+    List<UserBadgeUnitFormDTO> getUserSortedBadge(String userId,String customerId);
+
 }

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

@@ -42,6 +42,7 @@ 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.entity.UserAdviceEntity;
 import com.epmet.entity.UserAdviceImgEntity;
 import com.epmet.redis.UserAdviceRedis;
@@ -278,6 +279,20 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
         return getPageData(result, AdviceListResultDTO.class);
     }
 
+    /**
+     * @param pageSize
+     * @param pageNo
+     * @param loginUserId
+     * @return java.util.List<com.epmet.dto.result.MyAdviceListResultDTO>
+     * @Description 居民端-我的建议列表
+     * @Author liushaowen
+     * @Date 2020/11/9 17:39
+     */
+    @Override
+    public List<MyAdviceListResultDTO> myAdviceList(int pageSize, int pageNo, String loginUserId) {
+        return baseDao.myAdviceList(pageSize, pageNo, loginUserId);
+    }
+
     private void auditText(String text) {
         TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
         TextTaskDTO taskDTO = new TextTaskDTO();
@@ -285,14 +300,14 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
         taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
         textScanParamDTO.getTasks().add(taskDTO);
         Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
-        logger.info("用户建议文字审核入参:"+JSON.toJSONString(textScanParamDTO));
+        logger.info("用户建议文字审核入参:" + JSON.toJSONString(textScanParamDTO));
-        logger.info("用户建议文字审核返参:"+JSON.toJSONString(textSyncScanResult));
+        logger.info("用户建议文字审核返参:" + JSON.toJSONString(textSyncScanResult));
         if (!textSyncScanResult.success()) {
             logger.warn("用户建议文字审核接口返回失败,返参:", JSON.toJSONString(textSyncScanResult));
             throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         } else {
             if (!textSyncScanResult.getData().isAllPass()) {
-                logger.warn("用户建议文字审核失败,文字:",text);
+                logger.warn("用户建议文字审核失败,文字:", text);
                 throw new RenException(EpmetErrorCode.ACT_REQ_SCAN_FAILED.getCode());
             }
         }

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

@@ -10,6 +10,7 @@ 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.ResiUserBadgeDao;
 import com.epmet.dao.UserBadgeDao;
 import com.epmet.dto.UserBadgeCertificateRecordDTO;
 import com.epmet.dto.form.*;
@@ -157,6 +158,12 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         return new Result();
     }
 
+    /**
+     * @Description  站内信发送——提交徽章认证
+     * @Param form
+     * @author zxc
+     * @date 2020/11/10 9:04 上午
+     */
     public void sendMessageByUser(UserBadgeCertificateRecordDTO form){
         List<UserMessageFormDTO> msgList = new ArrayList<>();
         UserMessageFormDTO formDTO = new UserMessageFormDTO();
@@ -264,4 +271,17 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         userBadgeRedis.setCustomerBadge(userBadgeListResultDTOS, customerId);
     }
 
+    /**
+     * @Description 得到用户全部的显示徽章(排序)
+     * @param userId
+     * @param customerId
+     * @return java.util.List<com.epmet.dto.form.UserBadgeUnitFormDTO>
+     * @author wangc
+     * @date 2020.11.09 13:45
+     */
+    @Override
+    public List<UserBadgeUnitFormDTO> getUserSortedBadge(String userId, String customerId) {
+        return userBadgeDao.selectUserSortedBadge(userId,customerId);
+    }
+
 }

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

@@ -43,4 +43,25 @@
         where id = #{adviceId} and del_flag = 0
     </update>
 
+    <resultMap id="myAdviceListResultMap" type="com.epmet.dto.result.MyAdviceListResultDTO">
+        <id column="id"></id>
+        <result property="adviceContent" column="ADVICE_CONTENT"/>
+        <result property="adviceTime" column="ADVICE_TIME"/>
+        <result property="replyContent" column="REPLY_CONTENT"/>
+        <result property="replyTime" column="REPLY_TIME"/>
+        <collection property="imgList" select="getResiImgByAdviceId" column="id"></collection>
+    </resultMap>
+
+    <select id="myAdviceList" resultMap="myAdviceListResultMap">
+        select id,advice_content,advice_time,reply_content,reply_time
+        from user_advice
+        where del_flag = 0 and user_id = #{userId}
+        order by created_time desc
+        limit ${(pageNo-1)*pageSize},${pageSize};
+    </select>
+    <select id="getResiImgByAdviceId" resultType="String">
+        select img_url
+        from user_advice_img
+        where del_flag = 0 and advice_Id = #{id} and type = 'resi'
+    </select>
 </mapper>

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

@@ -202,4 +202,49 @@
         )
     </insert>
 
+    <!-- 查找用户全部的显示徽章(排序) -->
+    <select id="selectUserSortedBadge" resultType="com.epmet.dto.form.UserBadgeUnitFormDTO">
+                SELECT
+                        userBadge.badge_id,
+                        badgeInfo.BADGE_NAME,
+                        badgeInfo.BADGE_ICON
+                    FROM
+                        resi_user_badge userBadge
+                        LEFT JOIN (
+                                                            SELECT
+                                                                id AS badgeId,
+                                                                CUSTOMER_ID,
+                                                                BADGE_NAME,
+                                                                BADGE_ICON
+                                                            FROM
+                                                                (
+                                                            SELECT
+                                                                *
+                                                            FROM
+                                                                badge
+                                                            WHERE
+                                                                CUSTOMER_ID = #{customerId}
+                                                                AND DEL_FLAG = '0'
+                                                                AND BADGE_STATUS = 'online'
+                                                                 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 )
+                                                                ) temp
+                        ) badgeInfo ON userBadge.badge_id = badgeInfo.badgeId
+                    WHERE
+                        userBadge.del_flag = '0'
+                        AND userBadge.user_id = #{userId}
+                        AND userBadge.customer_id = #{customerId}
+                        AND userBadge.is_opened = 1
+                        AND userBadge.certification_autid_status = 'approved'
+                    ORDER BY
+                        userBadge.updated_time DESC
+    </select>
 </mapper>