Commit 223c81f0 authored by 韩桐桐's avatar 韩桐桐

feat:反馈建议-添加消息

parent 384df328
package com.yeejoin.amos.boot.module.common.biz.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.api.entity.FeedbackReplies;
import com.yeejoin.amos.boot.module.common.api.entity.FeedbackSuggestions;
import com.yeejoin.amos.boot.module.common.biz.service.impl.FeedbackRepliesServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.FeedbackSuggestionsServiceImpl;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -22,7 +19,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
......@@ -67,22 +63,7 @@ public class FeedbackRepliesController extends BaseController {
throw new BadRequest("缺少必要参数");
}
ReginParams reginParams = getSelectedOrgInfo();
CompanyBo company = reginParams.getCompany();
AgencyUserModel userModel = reginParams.getUserModel();
feedbackReplies.setCreateUserId(userModel.getUserId());
feedbackReplies.setCreateUserName(userModel.getRealName());
feedbackReplies.setCreateDate(new Date());
feedbackReplies.setReplyUserId(userModel.getUserId());
feedbackReplies.setReplyUserName(userModel.getRealName());
feedbackReplies.setReadStatus("0");
feedbackReplies.setReplyCompanyCode(company.getCompanyCode());
feedbackReplies.setReplyCompanyName(company.getCompanyName());
feedbackReplies = feedbackRepliesServiceImpl.createWithModel(feedbackReplies);
feedbackSuggestionsService.lambdaUpdate()
.eq(FeedbackSuggestions::getSequenceNbr,feedbackReplies.getSuggestionsSeq())
.set(FeedbackSuggestions::getStatus,"1")
.update();
return ResponseHelper.buildResponse(feedbackReplies);
return ResponseHelper.buildResponse(feedbackRepliesServiceImpl.saveReplies(reginParams, feedbackReplies));
}
/**
......
package com.yeejoin.amos.boot.module.common.biz.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.common.api.entity.FeedbackReplies;
import com.yeejoin.amos.boot.module.common.api.entity.FeedbackSuggestions;
import com.yeejoin.amos.boot.module.common.api.mapper.FeedbackRepliesMapper;
import com.yeejoin.amos.boot.module.common.api.service.IFeedbackRepliesService;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.Date;
import java.util.List;
/**
......@@ -31,6 +37,9 @@ public class FeedbackRepliesServiceImpl extends BaseService<FeedbackReplies, Fee
return this.queryForList("", false);
}
@Autowired
FeedbackSuggestionsServiceImpl feedbackSuggestionsServiceImpl;
/**
* 根据反馈建议表sequenceNbr查询回复列表
*
......@@ -44,4 +53,24 @@ public class FeedbackRepliesServiceImpl extends BaseService<FeedbackReplies, Fee
.orderByDesc(FeedbackReplies::getCreateDate)
.list();
}
public FeedbackReplies saveReplies(ReginParams reginParams, FeedbackReplies feedbackReplies) {
CompanyBo company = reginParams.getCompany();
AgencyUserModel userModel = reginParams.getUserModel();
feedbackReplies.setCreateUserId(userModel.getUserId());
feedbackReplies.setCreateUserName(userModel.getRealName());
feedbackReplies.setCreateDate(new Date());
feedbackReplies.setReplyUserId(userModel.getUserId());
feedbackReplies.setReplyUserName(userModel.getRealName());
feedbackReplies.setReadStatus("0");
feedbackReplies.setReplyCompanyCode(company.getCompanyCode());
feedbackReplies.setReplyCompanyName(company.getCompanyName());
this.save(feedbackReplies);
feedbackSuggestionsServiceImpl.lambdaUpdate()
.eq(FeedbackSuggestions::getSequenceNbr, feedbackReplies.getSuggestionsSeq())
.set(FeedbackSuggestions::getStatus, "1")
.update();
feedbackSuggestionsServiceImpl.sendMsg(feedbackSuggestionsServiceImpl.lambdaQuery().eq(FeedbackSuggestions::getSequenceNbr, feedbackReplies.getSuggestionsSeq()).one());
return feedbackReplies;
}
}
\ No newline at end of file
......@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.common.api.service.IFeedbackSuggestionsServi
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
......@@ -32,11 +33,16 @@ import java.util.Objects;
public class FeedbackSuggestionsServiceImpl extends BaseService<FeedbackSuggestions, FeedbackSuggestions, FeedbackSuggestionsMapper> implements IFeedbackSuggestionsService {
@Autowired
private EmqKeeper emqKeeper;
@Autowired
private RedisUtils redisUtils;
@Autowired
private FeedbackSuggestionsMapper feedbackSuggestionsMapper;
private static final String FEEDBACK_SUGGEST_TOPIC = "/topic/feedback/suggest";
/**
* 当前登录用户信息
*
......@@ -74,9 +80,19 @@ public class FeedbackSuggestionsServiceImpl extends BaseService<FeedbackSuggesti
// 回复状态(1:回复,0:未回复)
suggestions.setStatus(Objects.toString(0));
this.save(suggestions);
// 发布消息
sendMsg(suggestions);
return suggestions;
}
public void sendMsg(FeedbackSuggestions suggestions) {
try {
emqKeeper.getMqttClient().publish(FEEDBACK_SUGGEST_TOPIC, JSONObject.toJSONString(suggestions).getBytes("UTF-8"), 2, false);
} catch (Exception e) {
log.error(e.getMessage());
}
}
/**
* 分页查询
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment