luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

用户反馈信息详情、回复；兼容运营端+工作端；bugfix

master
yinzuomei 3 years ago
parent
d999609a7b
commit
e65aa491a2
8 changed files with 61 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ReplyAdviceFormDTO.java
  2. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java
  3. 3
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserAdviceDao.java
  4. 7
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/OperUserService.java
  5. 3
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java
  6. 16
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java
  7. 27
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
  8. 2
      epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml

11
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ReplyAdviceFormDTO.java
View File

@ -24,4 +24,15 @@ public class ReplyAdviceFormDTO implements Serializable {
private List<String> govImgList;
private String govContent;
/**
* 回复人id
* 工作端回复：customer_staff.user_id
* 运营端回复：oper_user.user_id
*/
private String replyUserId;
/**
* 政府端:gov、居民端:resi、运营端:oper
*/
private String app;
}

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

@ -118,9 +118,11 @@ public class UserAdviceController {
* @Date 2020/11/10 9:34
*/
@PostMapping("replyadvice")
public Result replyAdvice(@RequestBody ReplyAdviceFormDTO dto) {
public Result replyAdvice(@LoginUser TokenDto tokenDto,@RequestBody ReplyAdviceFormDTO dto) {
dto.setReplyUserId(tokenDto.getUserId());
dto.setApp(tokenDto.getApp());
ValidatorUtils.validateEntity(dto);
userAdviceService.replyAdvice(dto, loginUserUtil.getLoginUserId());
userAdviceService.replyAdvice(dto);
return new Result();
}

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

@ -38,7 +38,8 @@ public interface UserAdviceDao extends BaseDao<UserAdviceEntity> {
void replyAdvice(@Param("adviceId") String adviceId,
@Param("replyContent") String replyContent,
@Param("govContent") String govContent,
@Param("replyUserId") String loginUserId);
@Param("replyUserId") String replyUserId,
@Param("replyUserName")String replyUserName);
List<MyAdviceListResultDTO> myAdviceList(@Param("pageSize") int pageSize,
@Param("pageNo") int pageNo,

7
epmet-user/epmet-user-server/src/main/java/com/epmet/service/OperUserService.java
View File

@ -107,4 +107,11 @@ public interface OperUserService extends BaseService<OperUserEntity> {
* @param dto
*/
void updatePwd(String userId, PasswordDTO dto);
/**
* 查询运营人员信息
* @param userId
* @return
*/
OperUserDTO getOperUserDTO(String userId);
}

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

@ -102,12 +102,11 @@ public interface UserAdviceService extends BaseService<UserAdviceEntity> {
/**
* @Description 回复建议
* @param dto
* @param loginUserId
* @return void
* @Author liushaowen
* @Date 2020/11/6 16:44
*/
void replyAdvice(ReplyAdviceFormDTO dto, String loginUserId);
void replyAdvice(ReplyAdviceFormDTO dto);
/**
* @Description 建议详情

16
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java
View File

@ -196,4 +196,20 @@ public class OperUserServiceImpl extends BaseServiceImpl<OperUserDao, OperUserEn
baseDao.update(param, lambdaQueryWrapper);
}
/**
* 查询运营人员信息
*
* @param userId
* @return
*/
@Override
public OperUserDTO getOperUserDTO(String userId) {
LambdaQueryWrapper<OperUserEntity> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OperUserEntity::getUserId, userId);
OperUserEntity entity = baseDao.selectOne(queryWrapper);
if (null != entity) {
return ConvertUtils.sourceToTarget(entity, OperUserDTO.class);
}
return null;
}
}

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

@ -21,10 +21,13 @@ 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;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
import com.epmet.commons.tools.scan.param.ImgTaskDTO;
import com.epmet.commons.tools.scan.param.TextScanParamDTO;
@ -33,10 +36,12 @@ import com.epmet.commons.tools.scan.result.SyncScanResult;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.utils.ScanContentUtils;
import com.epmet.commons.tools.utils.SpringContextUtils;
import com.epmet.constant.UserAdviceConstant;
import com.epmet.dao.UserAdviceDao;
import com.epmet.dto.CustomerDTO;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.OperUserDTO;
import com.epmet.dto.UserAdviceDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.AdviceDetailResultDTO;
@ -148,14 +153,13 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
/**
* @param dto
* @param loginUserId
* @return void
* @Description 回复建议
* @Author liushaowen
* @Date 2020/11/6 16:44
*/
@Override
public void replyAdvice(ReplyAdviceFormDTO dto, String loginUserId) {
public void replyAdvice(ReplyAdviceFormDTO dto) {
//检验是否已经回复过
UserAdviceEntity userAdviceEntity = baseDao.selectById(dto.getAdviceId());
if (StringUtils.isNotBlank(userAdviceEntity.getReplyContent()) || StringUtils.isNotBlank(userAdviceEntity.getReplyUserId())) {
@ -164,9 +168,16 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
//审核图片
auditPic(dto.getGovImgList());
//审核文字
auditText(dto.getReplyContent());
// auditText(dto.getReplyContent());// 运营端或者工组人员回复，不需要走内容审核了。
String replyUserName = StrConstant.EPMETY_STR;
if (AppClientConstant.APP_GOV.equals(dto.getApp())) {
replyUserName = CustomerStaffRedis.getStaffInfo(userAdviceEntity.getCustomerId(), dto.getReplyUserId()).getRealName();
} else if (AppClientConstant.APP_OPER.equals(dto.getApp())) {
OperUserDTO operUserDTO = SpringContextUtils.getBean(OperUserServiceImpl.class).getOperUserDTO(dto.getReplyUserId());
replyUserName = null != operUserDTO ? operUserDTO.getRealName() : StrConstant.EPMETY_STR;
}
//更新advice表
baseDao.replyAdvice(dto.getAdviceId(), dto.getReplyContent(), dto.getGovContent(), loginUserId);
baseDao.replyAdvice(dto.getAdviceId(), dto.getReplyContent(), dto.getGovContent(), dto.getReplyUserId(),replyUserName);
//如果govImg不为空，插入advice_img表
List<String> govImgList = dto.getGovImgList();
if (!Collections.isEmpty(govImgList)) {
@ -179,7 +190,7 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
UserAdviceImgEntity entity = new UserAdviceImgEntity();
entity.setImgUrl(govImgList.get(i));
entity.setAdviceId(dto.getAdviceId());
entity.setType("oper");
entity.setType(dto.getApp());
userAdviceImgEntities.add(entity);
}
userAdviceImgService.insertBatch(userAdviceImgEntities);
@ -222,9 +233,9 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
List<String> govImgList = new ArrayList<>();
List<String> resiImgList = new ArrayList<>();
for (UserAdviceImgEntity entity : imgsByAdviceId) {
if ("resi".equals(entity.getType())) {
if (AppClientConstant.APP_RESI.equals(entity.getType())) {
resiImgList.add(entity.getImgUrl());
} else if ("oper".equals(entity.getType())) {
} else if (AppClientConstant.APP_OPER.equals(entity.getType())||AppClientConstant.APP_GOV.equals(entity.getType())) {
govImgList.add(entity.getImgUrl());
}
}
@ -410,7 +421,7 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
UserAdviceImgEntity entity = new UserAdviceImgEntity();
entity.setImgUrl(govImgList.get(i));
entity.setAdviceId(userAdviceDTO.getId());
entity.setType("resi");
entity.setType(AppClientConstant.APP_RESI);
userAdviceImgEntities.add(entity);
}
userAdviceImgService.insertBatch(userAdviceImgEntities);

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

@ -39,7 +39,7 @@
reply_user_id = #{replyUserId},
reply_time = now(),
gov_content = #{govContent},
reply_user_name = (select real_name from oper_user where user_id = #{replyUserId} and del_flag = 0),
reply_user_name = #{replyUserName},
updated_by = #{replyUserId},
updated_time = now()
where id = #{adviceId} and del_flag = 0

Write Preview
Loading…
Cancel
Save