From e9a1db3d025bcaaedd877b32a0da3cbafb504086 Mon Sep 17 00:00:00 2001 From: tamguo Date: Sun, 19 Aug 2018 13:04:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tamguo/common/utils/SystemConstant.java | 2 +- .../tiku/dao/QuestionAnswerMapper.java | 8 +++ .../tiku/model/QuestionAnswerEntity.java | 8 ++- .../tiku/service/IQuestionAnswerService.java | 10 +++ .../impl/QuestionAnswerServiceImpl.java | 25 +++++++ .../tamguo/web/member/AccountController.java | 2 +- .../tamguo/web/member/LoginController.java | 8 +++ .../web/member/QuestionAnswerController.java | 30 ++++++++ .../tamguo/web/tiku/QuestionContrller.java | 5 ++ .../templates/include/minilogin.html | 2 +- .../main/resources/templates/question.html | 69 ++++++++++++++++--- 11 files changed, 154 insertions(+), 15 deletions(-) create mode 100644 tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/QuestionAnswerMapper.java create mode 100644 tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IQuestionAnswerService.java create mode 100644 tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/QuestionAnswerServiceImpl.java create mode 100644 tamguo-tms/src/main/java/com/tamguo/web/member/QuestionAnswerController.java diff --git a/tamguo-common/src/main/java/com/tamguo/common/utils/SystemConstant.java b/tamguo-common/src/main/java/com/tamguo/common/utils/SystemConstant.java index 7474b6b..947eefb 100644 --- a/tamguo-common/src/main/java/com/tamguo/common/utils/SystemConstant.java +++ b/tamguo-common/src/main/java/com/tamguo/common/utils/SystemConstant.java @@ -69,7 +69,7 @@ public class SystemConstant { public static final String ALIYUN_MAIL_FIND_PASSWORD_PREFIX = "EMAIL_FIND_PASSWORD_"; /** 默认会员头像*/ - public static final String DEFAULT_MEMBER_AVATAR = "images/avatar.png"; + public static final String DEFAULT_MEMBER_AVATAR = "/images/avatar.png"; /** 登录错误次数*/ public static final String LOGIN_FAILURE_COUNT = "loginFailureCount:"; diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/QuestionAnswerMapper.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/QuestionAnswerMapper.java new file mode 100644 index 0000000..19cb323 --- /dev/null +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/QuestionAnswerMapper.java @@ -0,0 +1,8 @@ +package com.tamguo.modules.tiku.dao; + +import com.tamguo.config.dao.SuperMapper; +import com.tamguo.modules.tiku.model.QuestionAnswerEntity; + +public interface QuestionAnswerMapper extends SuperMapper{ + +} diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/QuestionAnswerEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/QuestionAnswerEntity.java index 132b69d..d6f5a3e 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/QuestionAnswerEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/QuestionAnswerEntity.java @@ -2,7 +2,6 @@ package com.tamguo.modules.tiku.model; import java.io.Serializable; import java.util.Date; - import com.baomidou.mybatisplus.annotations.TableName; import com.tamguo.config.dao.SuperEntity; @@ -13,6 +12,7 @@ public class QuestionAnswerEntity extends SuperEntity implements Se private String questionId; private String memberId; + private String memberAvatar; private String memberName; private String answer; private Integer agreeNum; @@ -63,6 +63,12 @@ public class QuestionAnswerEntity extends SuperEntity implements Se } public static long getSerialversionuid() { return serialVersionUID; + } + public String getMemberAvatar() { + return memberAvatar; + } + public void setMemberAvatar(String memberAvatar) { + this.memberAvatar = memberAvatar; } } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IQuestionAnswerService.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IQuestionAnswerService.java new file mode 100644 index 0000000..bbbf2d9 --- /dev/null +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IQuestionAnswerService.java @@ -0,0 +1,10 @@ +package com.tamguo.modules.tiku.service; + +import com.baomidou.mybatisplus.service.IService; +import com.tamguo.modules.tiku.model.QuestionAnswerEntity; + +public interface IQuestionAnswerService extends IService{ + + void sendAnswer(QuestionAnswerEntity entity); + +} diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/QuestionAnswerServiceImpl.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/QuestionAnswerServiceImpl.java new file mode 100644 index 0000000..9f4074a --- /dev/null +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/QuestionAnswerServiceImpl.java @@ -0,0 +1,25 @@ +package com.tamguo.modules.tiku.service.impl; + +import java.util.Date; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.tamguo.modules.tiku.dao.QuestionAnswerMapper; +import com.tamguo.modules.tiku.model.QuestionAnswerEntity; +import com.tamguo.modules.tiku.service.IQuestionAnswerService; + +@Service +public class QuestionAnswerServiceImpl extends ServiceImpl implements IQuestionAnswerService{ + + @Transactional(readOnly=false) + @Override + public void sendAnswer(QuestionAnswerEntity entity) { + entity.setCreateDate(new Date()); + entity.setAgreeNum(0); + entity.setDisagreeNum(0); + baseMapper.insert(entity); + } + +} diff --git a/tamguo-tms/src/main/java/com/tamguo/web/member/AccountController.java b/tamguo-tms/src/main/java/com/tamguo/web/member/AccountController.java index 3770880..e4bfdd2 100644 --- a/tamguo-tms/src/main/java/com/tamguo/web/member/AccountController.java +++ b/tamguo-tms/src/main/java/com/tamguo/web/member/AccountController.java @@ -109,7 +109,7 @@ public class AccountController { UploaderMessage msg = new UploaderMessage(); msg.setStatus(Status.SUCCESS); msg.setStatusMsg("File upload success"); - msg.setFilePath("files/" + DateUtils.format(new Date(), "yyyyMMdd") + "/" + avatorName); + msg.setFilePath("/files/" + DateUtils.format(new Date(), "yyyyMMdd") + "/" + avatorName); msg.setFileDomain(domainName); return msg; } catch (Exception e) { diff --git a/tamguo-tms/src/main/java/com/tamguo/web/member/LoginController.java b/tamguo-tms/src/main/java/com/tamguo/web/member/LoginController.java index 0d85a59..b4cbb8f 100644 --- a/tamguo-tms/src/main/java/com/tamguo/web/member/LoginController.java +++ b/tamguo-tms/src/main/java/com/tamguo/web/member/LoginController.java @@ -104,4 +104,12 @@ public class LoginController { return result; } + @RequestMapping(value = "/isLogin.html", method = RequestMethod.GET) + @ResponseBody + public Result isLogin() { + if(ShiroUtils.isLogin()) { + return Result.result(1, null , "已经登录"); + } + return Result.result(0, null, "未登录"); + } } diff --git a/tamguo-tms/src/main/java/com/tamguo/web/member/QuestionAnswerController.java b/tamguo-tms/src/main/java/com/tamguo/web/member/QuestionAnswerController.java new file mode 100644 index 0000000..abf25ad --- /dev/null +++ b/tamguo-tms/src/main/java/com/tamguo/web/member/QuestionAnswerController.java @@ -0,0 +1,30 @@ +package com.tamguo.web.member; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import com.tamguo.common.utils.Result; +import com.tamguo.modules.tiku.model.QuestionAnswerEntity; +import com.tamguo.modules.tiku.service.IQuestionAnswerService; +import com.tamguo.utils.ShiroUtils; + +@Controller +public class QuestionAnswerController { + + @Autowired + private IQuestionAnswerService iQuestionAnswerService; + + @RequestMapping(value = "member/sendAnswer.html", method = RequestMethod.POST) + @ResponseBody + public Result sendAnswer(@RequestBody QuestionAnswerEntity entity){ + entity.setMemberAvatar(ShiroUtils.getMember().getAvatar()); + entity.setMemberId(ShiroUtils.getMemberId()); + entity.setMemberName(ShiroUtils.getMember().getNickName()); + iQuestionAnswerService.sendAnswer(entity); + return Result.result(0, null, "保存成功"); + } + +} diff --git a/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java b/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java index 13ffc47..edea471 100644 --- a/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java +++ b/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java @@ -22,6 +22,7 @@ import com.tamguo.modules.tiku.model.QuestionEntity; import com.tamguo.modules.tiku.model.SubjectEntity; import com.tamguo.modules.tiku.service.IChapterService; import com.tamguo.modules.tiku.service.ICourseService; +import com.tamguo.modules.tiku.service.IQuestionAnswerService; import com.tamguo.modules.tiku.service.IQuestionService; import com.tamguo.modules.tiku.service.ISubjectService; @@ -38,6 +39,8 @@ public class QuestionContrller { private ISubjectService iSubjectService; @Autowired private ICourseService iCourseService; + @Autowired + private IQuestionAnswerService iQuestionAnswerService; @SuppressWarnings("unchecked") @RequestMapping(value = {"questionlist/{chapterId}-{current}-{size}.html"}, method = RequestMethod.GET) @@ -80,6 +83,7 @@ public class QuestionContrller { * @param model * @return */ + @SuppressWarnings("unchecked") @RequestMapping(value = {"/question/{uid}.html"}, method = RequestMethod.GET) public ModelAndView question(@PathVariable String uid , ModelAndView model , HttpServletRequest request){ try { @@ -89,6 +93,7 @@ public class QuestionContrller { QuestionEntity question = iQuestionService.selectById(uid); question.setQuestionType(question.getQuestionType()); model.addObject("question", question); + model.addObject("answerList", iQuestionAnswerService.selectList(Condition.create().eq("question_id", uid).orderDesc(Arrays.asList("create_date")))); return model; } catch (Exception e) { model.setViewName("404"); diff --git a/tamguo-tms/src/main/resources/templates/include/minilogin.html b/tamguo-tms/src/main/resources/templates/include/minilogin.html index cdb3161..dabe97f 100644 --- a/tamguo-tms/src/main/resources/templates/include/minilogin.html +++ b/tamguo-tms/src/main/resources/templates/include/minilogin.html @@ -1,6 +1,6 @@ -