From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/question/UpdateQuestionAnswerCmd.java | 76 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 5 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/question/UpdateQuestionAnswerCmd.java b/service-user/src/main/java/com/java110/user/cmd/question/UpdateQuestionAnswerCmd.java
index 64e427d..459d8f1 100644
--- a/service-user/src/main/java/com/java110/user/cmd/question/UpdateQuestionAnswerCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/question/UpdateQuestionAnswerCmd.java
@@ -15,14 +15,22 @@
*/
package com.java110.user.cmd.question;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.questionAnswer.QuestionAnswerDto;
+import com.java110.intf.user.IQuestionAnswerTitleRelV1InnerServiceSMO;
import com.java110.intf.user.IQuestionAnswerV1InnerServiceSMO;
+import com.java110.intf.user.IUserQuestionAnswerV1InnerServiceSMO;
import com.java110.po.questionAnswer.QuestionAnswerPo;
+import com.java110.po.questionAnswerTitleRel.QuestionAnswerTitleRelPo;
+import com.java110.po.user.UserQuestionAnswerPo;
+import com.java110.user.bmo.question.IQuestionAnswerBMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -47,14 +55,32 @@
private static Logger logger = LoggerFactory.getLogger(UpdateQuestionAnswerCmd.class);
-
@Autowired
private IQuestionAnswerV1InnerServiceSMO questionAnswerV1InnerServiceSMOImpl;
+ @Autowired
+ private IQuestionAnswerTitleRelV1InnerServiceSMO questionAnswerTitleRelV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IQuestionAnswerBMO questionAnswerBMOImpl;
+
+ @Autowired
+ private IUserQuestionAnswerV1InnerServiceSMO userQuestionAnswerV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "qaId", "qaId涓嶈兘涓虹┖");
- Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
+ Assert.hasKeyAndValue(reqJson, "qaName", "璇锋眰鎶ユ枃涓湭鍖呭惈鎶曠エ鍚嶇О");
+ Assert.hasKeyAndValue(reqJson, "qaId", "璇锋眰鎶ユ枃涓湭鍖呭惈棰樼洰");
+ Assert.hasKeyAndValue(reqJson, "startTime", "鏈寘鍚紑濮嬫椂闂�");
+ Assert.hasKeyAndValue(reqJson, "endTime", "鏈寘鍚粨鏉熸椂闂�");
+ Assert.hasKeyAndValue(reqJson, "content", "鏈寘鍚鏄�");
+ Assert.hasKey(reqJson, "questionTitles", "璇锋眰鎶ユ枃涓湭鍖呭惈棰樼洰");
+
+ JSONArray questionTitles = reqJson.getJSONArray("questionTitles");
+ if (questionTitles == null || questionTitles.size() < 1) {
+ throw new IllegalArgumentException("鏈寘鍚鐩�");
+ }
}
@@ -62,12 +88,52 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- QuestionAnswerPo questionAnswerPo = BeanConvertUtil.covertBean(reqJson, QuestionAnswerPo.class);
+ //todo 鍐欏叆鎶曠エ淇℃伅
+ QuestionAnswerPo questionAnswerPo = new QuestionAnswerPo();
+ questionAnswerPo.setContent(reqJson.getString("content"));
+ questionAnswerPo.setEndTime(reqJson.getString("endTime"));
+ questionAnswerPo.setStartTime(reqJson.getString("startTime"));
+ questionAnswerPo.setQaId(reqJson.getString("qaId"));
+ questionAnswerPo.setQaName(reqJson.getString("qaName"));
+ questionAnswerPo.setCommunityId(reqJson.getString("communityId"));
+ questionAnswerPo.setQaType(QuestionAnswerDto.QA_TYPE_QUESTION);
+ questionAnswerPo.setState(QuestionAnswerDto.STATE_WAIT);
int flag = questionAnswerV1InnerServiceSMOImpl.updateQuestionAnswer(questionAnswerPo);
if (flag < 1) {
- throw new CmdException("鏇存柊鏁版嵁澶辫触");
+ throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
+ JSONArray questionTitles = reqJson.getJSONArray("questionTitles");
+ QuestionAnswerTitleRelPo questionAnswerTitleRelPo = new QuestionAnswerTitleRelPo();
+ questionAnswerTitleRelPo.setQaId(reqJson.getString("qaId"));
+ questionAnswerTitleRelPo.setCommunityId(reqJson.getString("communityId"));
+ questionAnswerTitleRelV1InnerServiceSMOImpl.deleteQuestionAnswerTitleRel(questionAnswerTitleRelPo);
+ JSONObject title = null;
+ for (int titleIndex = 0; titleIndex < questionTitles.size(); titleIndex++) {
+ title= questionTitles.getJSONObject(titleIndex);
+ questionAnswerTitleRelPo = new QuestionAnswerTitleRelPo();
+ questionAnswerTitleRelPo.setCommunityId(reqJson.getString("communityId"));
+ questionAnswerTitleRelPo.setTitleId(title.getString("titleId"));
+ questionAnswerTitleRelPo.setSeq((titleIndex + 1) + "");
+ questionAnswerTitleRelPo.setScore("0");
+ if(title.containsKey("score")){
+ questionAnswerTitleRelPo.setScore(title.getString("score"));
+ }
+ questionAnswerTitleRelPo.setQaId(questionAnswerPo.getQaId());
+ questionAnswerTitleRelPo.setQatrId(GenerateCodeFactory.getGeneratorId("11"));
+ questionAnswerTitleRelV1InnerServiceSMOImpl.saveQuestionAnswerTitleRel(questionAnswerTitleRelPo);
+ }
+
+ JSONArray roomIds = reqJson.getJSONArray("roomIds");
+ if(roomIds == null || roomIds.size() < 1){
+ return ;
+ }
+ UserQuestionAnswerPo userQuestionAnswerPo = new UserQuestionAnswerPo();
+ userQuestionAnswerPo.setQaId(reqJson.getString("qaId"));
+ userQuestionAnswerPo.setCommunityId(reqJson.getString("communityId"));
+ userQuestionAnswerV1InnerServiceSMOImpl.deleteUserQuestionAnswer(userQuestionAnswerPo);
+
+ questionAnswerBMOImpl.saveUserQuestionAnswer(questionAnswerPo, reqJson.getJSONArray("roomIds"));
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
--
Gitblit v1.8.0