From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java |   36 ++++++++++++++++++++----------------
 1 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java
index 8fe6133..348930c 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java
@@ -25,29 +25,31 @@
     private FrequentlyAskedQuestionsService faqService;
 
 
-    private final SimpleDateFormat format  = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+    private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
     /**
      * 添加常见问题
      */
     @RequestMapping("/base/question/addQuestion")
-    public Object addQuestion(@RequestBody FrequentlyAskedQuestions frequentlyAskedQuestions){
+    public Object addQuestion(@RequestBody FrequentlyAskedQuestions frequentlyAskedQuestions) {
         frequentlyAskedQuestions.setInsertTime(new Date());
         frequentlyAskedQuestions.setState(1);
         return faqService.save(frequentlyAskedQuestions);
     }
+
     /**
      * 修改常见问题
      */
     @RequestMapping("/base/question/editQuestion")
-    public Object editQuestion(@RequestBody FrequentlyAskedQuestions frequentlyAskedQuestions){
+    public Object editQuestion(@RequestBody FrequentlyAskedQuestions frequentlyAskedQuestions) {
         return faqService.updateById(frequentlyAskedQuestions);
     }
+
     /**
      * 上/下架、删除常见问题 type=1为上架 2为下架 3为删除
      */
     @RequestMapping("/base/question/changeState")
-    public Object changeState(@RequestBody QuestionChangeStateVO vo){
+    public Object changeState(@RequestBody QuestionChangeStateVO vo) {
         return faqService.changeState(vo);
     }
 
@@ -55,7 +57,7 @@
      * 查看详情
      */
     @RequestMapping("/base/question/getInfo")
-    public FrequentlyAskedQuestions getInfo(@RequestBody Integer id){
+    public FrequentlyAskedQuestions getInfo(@RequestBody Integer id) {
         return faqService.getInfo(id);
     }
 
@@ -63,23 +65,25 @@
      * 编辑常见问题
      */
     @RequestMapping("/base/question/updateQuestion")
-    public Object updateQuestion(@RequestBody FrequentlyAskedQuestions frequentlyAskedQuestions){
+    public Object updateQuestion(@RequestBody FrequentlyAskedQuestions frequentlyAskedQuestions) {
         return faqService.updateById(frequentlyAskedQuestions);
     }
+
     /**
      * 获取所有常见问题
+     *
      * @return
      */
     @RequestMapping("/base/question/listAll")
-    public List<FrequentlyAskedQuestions> listAll(@RequestBody QuestionSearchVO vo){
+    public List<FrequentlyAskedQuestions> listAll(@RequestBody QuestionSearchVO vo) {
         QueryWrapper<FrequentlyAskedQuestions> frequentlyAskedQuestionsQueryWrapper = new QueryWrapper<>();
-        if (vo.getState()!=null){
-            frequentlyAskedQuestionsQueryWrapper.eq("state",vo.getState());
+        if (vo.getState() != null) {
+            frequentlyAskedQuestionsQueryWrapper.eq("state", vo.getState());
         }
-        if (vo.getContent()!=null && !vo.getContent().equals("") ){
-            frequentlyAskedQuestionsQueryWrapper.like("content",vo.getContent());
+        if (vo.getContent() != null && !vo.getContent().equals("")) {
+            frequentlyAskedQuestionsQueryWrapper.like("content", vo.getContent());
         }
-        frequentlyAskedQuestionsQueryWrapper.ne("state",3);
+        frequentlyAskedQuestionsQueryWrapper.ne("state", 3);
         frequentlyAskedQuestionsQueryWrapper.orderByDesc("sort");
         List<FrequentlyAskedQuestions> list = faqService.list(frequentlyAskedQuestionsQueryWrapper);
         return list;
@@ -87,12 +91,12 @@
 
     @ResponseBody
     @PostMapping("/base/notice/queryQuestionDetails")
-    public List<QuestionIns> getSysQuestionDetails(){
+    public List<QuestionIns> getSysQuestionDetails() {
         List<QuestionIns> sysS = new ArrayList<>();
         List<FrequentlyAskedQuestions> list = faqService.list(new QueryWrapper<FrequentlyAskedQuestions>()
                 .eq("state", 1)
                 .orderByDesc("insertTime"));
-        if (list.size() > 0 ){
+        if (list.size() > 0) {
             list.forEach(noList -> {
                 QuestionIns notice = new QuestionIns();
                 notice.setQuesId(noList.getId());
@@ -106,10 +110,10 @@
 
 
     @PostMapping("/base/notice/queryQuestion")
-    public QuestionIns getSysQuestionBuId(@RequestParam("quesId") Integer quesId){
+    public QuestionIns getSysQuestionBuId(@RequestParam("quesId") Integer quesId) {
         QuestionIns sysNotice = new QuestionIns();
         FrequentlyAskedQuestions notice = faqService.getById(quesId);
-        if (null != notice){
+        if (null != notice) {
             sysNotice.setQuesId(notice.getId());
             sysNotice.setQuesTitle(notice.getContent());
             sysNotice.setQuesContents(notice.getAnswer());

--
Gitblit v1.7.1