Merge branch 'master' of https://github.com/Jackson0714/passjava-platform

Author: Jackson0714

passjava-common/src/main/java/com/jackson0714/common/to/es/QuestionEsModel.java

@@ -0,0 +1,38 @@
+package com.jackson0714.common.to.es;
+
+import lombok.Data;
+
+/**
+ * @Author: 公众号 | 悟空聊架构
+ * @Date: 2021/3/31 15:16
+ * @Site: www.passjava.cn
+ * @Github: https://github.com/Jackson0714/PassJava-Platform
+ */
+
+/*
+"properties": {
+    "id": {
+        "type": "long"
+    }
+    "title": {
+        "type": "keyword",
+        "analyzer": "ik_smart"
+    },
+    "answer": : {
+        "type": "keyword",
+        "analyzer": "ik_smart"
+	},
+	"typeName": {
+        "type": "keyword",
+    },
+}
+* */
+@Data
+public class QuestionEsModel {
+
+    private Long id;
+    private String title;
+    private String answer;
+    private String typeName;
+
+}

passjava-question/src/main/java/com/jackson0714/passjava/question/controller/QuestionController.java

@@ -11,7 +11,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.jackson0714.passjava.question.entity.QuestionEntity;
-import com.jackson0714.passjava.question.service.QuestionService;
+import com.jackson0714.passjava.question.service.IQuestionService;
 import com.jackson0714.common.utils.PageUtils;
 import com.jackson0714.common.utils.R;
 
@@ -29,7 +29,7 @@
 @RequestMapping("question/v1/admin/question")
 public class QuestionController {
     @Autowired
-    private QuestionService questionService;
+    private IQuestionService IQuestionService;
 
     /**
      * 列表
@@ -38,7 +38,7 @@ public class QuestionController {
     //@RequiresPermissions("question:question:list")
     public R list(@RequestParam Map<String, Object> params){
         long time = System.currentTimeMillis();
-        PageUtils page = questionService.queryPage(params);
+        PageUtils page = IQuestionService.queryPage(params);
         System.out.println("耗时："+ (System.currentTimeMillis() - time));
         return R.ok().put("page", page);
     }
@@ -50,7 +50,7 @@ public R list(@RequestParam Map<String, Object> params){
     @RequestMapping("/info/{id}")
     //@RequiresPermissions("question:question:info")
     public R info(@PathVariable("id") Long id) {
-		QuestionEntity question = questionService.getById(id);
+		QuestionEntity question = IQuestionService.getById(id);
         return R.ok().put("question", question);
     }
 
@@ -60,7 +60,7 @@ public R info(@PathVariable("id") Long id) {
     @RequestMapping("/save")
     //@RequiresPermissions("question:question:save")
     public R save(@Valid @RequestBody QuestionEntity question){
-		questionService.save(question);
+		IQuestionService.saveQuestion(question);
 
         return R.ok();
     }
@@ -71,8 +71,7 @@ public R save(@Valid @RequestBody QuestionEntity question){
     @RequestMapping("/update")
     //@RequiresPermissions("question:question:update")
     public R update(@RequestBody QuestionEntity question){
-		questionService.updateById(question);
-
+		IQuestionService.updateQuestion(question);
 
         return R.ok();
     }
@@ -83,7 +82,7 @@ public R update(@RequestBody QuestionEntity question){
     @RequestMapping("/delete")
     //@RequiresPermissions("question:question:delete")
     public R delete(@RequestBody Long[] ids){
-		questionService.removeByIds(Arrays.asList(ids));
+		IQuestionService.removeByIds(Arrays.asList(ids));
 
         return R.ok();
     }

passjava-question/src/main/java/com/jackson0714/passjava/question/controller/TypeController.java

@@ -11,7 +11,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.jackson0714.passjava.question.entity.TypeEntity;
-import com.jackson0714.passjava.question.service.TypeService;
+import com.jackson0714.passjava.question.service.ITypeService;
 import com.jackson0714.common.utils.PageUtils;
 import com.jackson0714.common.utils.R;
 
@@ -28,15 +28,15 @@
 @RequestMapping("question/type")
 public class TypeController {
     @Autowired
-    private TypeService typeService;
+    private ITypeService ITypeService;
 
     /**
      * 列表
      */
     @RequestMapping("/list")
     //@RequiresPermissions("question:type:list")
     public R list(@RequestParam Map<String, Object> params){
-        PageUtils page = typeService.queryPage(params);
+        PageUtils page = ITypeService.queryPage(params);
 
         return R.ok().put("page", page);
     }
@@ -48,7 +48,7 @@ public R list(@RequestParam Map<String, Object> params){
     @RequestMapping("/info/{id}")
     //@RequiresPermissions("question:type:info")
     public R info(@PathVariable("id") Long id){
-		TypeEntity type = typeService.getById(id);
+		TypeEntity type = ITypeService.getById(id);
 
         return R.ok().put("type", type);
     }
@@ -59,7 +59,7 @@ public R info(@PathVariable("id") Long id){
     @RequestMapping("/save")
     //@RequiresPermissions("question:type:save")
     public R save(@RequestBody TypeEntity type){
-		typeService.save(type);
+		ITypeService.save(type);
 
         return R.ok();
     }
@@ -70,7 +70,7 @@ public R save(@RequestBody TypeEntity type){
     @RequestMapping("/update")
     //@RequiresPermissions("question:type:update")
     public R update(@RequestBody TypeEntity type){
-		typeService.updateById(type);
+		ITypeService.updateById(type);
 
         return R.ok();
     }
@@ -81,7 +81,7 @@ public R update(@RequestBody TypeEntity type){
     @RequestMapping("/delete")
     //@RequiresPermissions("question:type:delete")
     public R delete(@RequestBody Long[] ids){
-		typeService.removeByIds(Arrays.asList(ids));
+		ITypeService.removeByIds(Arrays.asList(ids));
 
         return R.ok();
     }

passjava-question/src/main/java/com/jackson0714/passjava/question/exception/PassjavaExceptionControllerAdvice.java

@@ -23,6 +23,7 @@ public class PassjavaExceptionControllerAdvice {
     @ExceptionHandler(value= MethodArgumentNotValidException.class)
     public R handleValidException(MethodArgumentNotValidException e) {
         //log.error("数据校验出现问题{}，异常类型：{}", e.getMessage(), e.getClass());
+        System.out.println(e.getMessage());
         BindingResult bindingResult = e.getBindingResult();
         Map<String, String> errorMap = new HashMap<>();
         bindingResult.getFieldErrors().forEach((fieldError)->{
@@ -35,6 +36,7 @@ public R handleValidException(MethodArgumentNotValidException e) {
     @ExceptionHandler(value=Throwable.class)
     public R handleException(Throwable throwable) {
         //log.error("未知异常{}，异常类型：{}", throwable.getMessage(), throwable.getClass());
+        System.out.println(throwable.getMessage());
         return R.error(BizCodeEnum.UNKNOWN_EXCEPTION.getCode(), BizCodeEnum.UNKNOWN_EXCEPTION.getMsg());
     }
 }

…va/question/service/QuestionService.java …a/question/service/IQuestionService.javapassjava-question/src/main/java/com/jackson0714/passjava/question/service/QuestionService.java renamed to passjava-question/src/main/java/com/jackson0714/passjava/question/service/IQuestionService.java passjava-question/src/main/java/com/jackson0714/passjava/question/service/QuestionService.java renamed to passjava-question/src/main/java/com/jackson0714/passjava/question/service/IQuestionService.java

@@ -13,8 +13,12 @@
  * @email jackson0585@163.com
  * @date 2020-04-25 22:34:04
  */
-public interface QuestionService extends IService<QuestionEntity> {
+public interface IQuestionService extends IService<QuestionEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
+
+    boolean saveQuestion(QuestionEntity question);
+
+    boolean updateQuestion(QuestionEntity question);
 }
 

…ssjava/question/service/TypeService.java …sjava/question/service/ITypeService.javapassjava-question/src/main/java/com/jackson0714/passjava/question/service/TypeService.java renamed to passjava-question/src/main/java/com/jackson0714/passjava/question/service/ITypeService.java passjava-question/src/main/java/com/jackson0714/passjava/question/service/TypeService.java renamed to passjava-question/src/main/java/com/jackson0714/passjava/question/service/ITypeService.java

@@ -13,7 +13,7 @@
  * @email jackson0585@163.com
  * @date 2020-04-25 22:34:04
  */
-public interface TypeService extends IService<TypeEntity> {
+public interface ITypeService extends IService<TypeEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
 }

passjava-question/src/main/java/com/jackson0714/passjava/question/service/impl/QuestionServiceImpl.java

@@ -1,6 +1,11 @@
 package com.jackson0714.passjava.question.service.impl;
 
+import com.jackson0714.common.to.es.QuestionEsModel;
+import com.jackson0714.passjava.question.entity.TypeEntity;
+import com.jackson0714.passjava.question.service.ITypeService;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,11 +16,14 @@
 
 import com.jackson0714.passjava.question.dao.QuestionDao;
 import com.jackson0714.passjava.question.entity.QuestionEntity;
-import com.jackson0714.passjava.question.service.QuestionService;
+import com.jackson0714.passjava.question.service.IQuestionService;
 
 
 @Service("questionService")
-public class QuestionServiceImpl extends ServiceImpl<QuestionDao, QuestionEntity> implements QuestionService {
+public class QuestionServiceImpl extends ServiceImpl<QuestionDao, QuestionEntity> implements IQuestionService {
+
+    @Autowired
+    ITypeService ITypeService;
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
@@ -38,4 +46,36 @@ public PageUtils queryPage(Map<String, Object> params) {
         return new PageUtils(page);
     }
 
+    @Override
+    public boolean saveQuestion(QuestionEntity question) {
+        boolean saveResult = save(question);
+        saveEs(question);
+
+        return true;
+    }
+
+    @Override
+    public boolean updateQuestion(QuestionEntity question) {
+        updateById(question);
+        saveEs(question);
+        return false;
+    }
+
+    private boolean saveEs(QuestionEntity question) {
+        // 1.创建 ES model
+        QuestionEsModel esModel = new QuestionEsModel();
+        // 2.复制属性
+        // 2.1 复制属性
+        BeanUtils.copyProperties(question, esModel);
+        // 2.2 获取“题目类型”的名称
+        TypeEntity typeEntity = ITypeService.getById(question.getType());
+        String typeName = typeEntity.getType();
+        // 2.3 给 ES model 的“类型”字段赋值
+        esModel.setTypeName(typeName);
+        // 3.
+        System.out.println("-----------------esModel:" + esModel);
+
+        return false;
+    }
+
 }

passjava-question/src/main/java/com/jackson0714/passjava/question/service/impl/TypeServiceImpl.java

@@ -10,11 +10,11 @@
 
 import com.jackson0714.passjava.question.dao.TypeDao;
 import com.jackson0714.passjava.question.entity.TypeEntity;
-import com.jackson0714.passjava.question.service.TypeService;
+import com.jackson0714.passjava.question.service.ITypeService;
 
 
 @Service("typeService")
-public class TypeServiceImpl extends ServiceImpl<TypeDao, TypeEntity> implements TypeService {
+public class TypeServiceImpl extends ServiceImpl<TypeDao, TypeEntity> implements ITypeService {
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {

passjava-question/src/test/java/com/jackson0714/passjava/question/PassjavaQuestionApplicationTests.java

@@ -2,26 +2,25 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jackson0714.passjava.question.entity.TypeEntity;
-import com.jackson0714.passjava.question.service.TypeService;
+import com.jackson0714.passjava.question.service.ITypeService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import java.io.ByteArrayInputStream;
 import java.util.List;
 
 @SpringBootTest
 class PassjavaQuestionApplicationTests {
 
     @Autowired
-    TypeService typeService;
+    ITypeService ITypeService;
 
     // 创建题目类型
     @Test
     void testCreateType() {
         TypeEntity typeEntity = new TypeEntity();
         typeEntity.setType("javaBasic");
-        typeService.save(typeEntity);
+        ITypeService.save(typeEntity);
         System.out.println("创建成功");
     }
 
@@ -31,14 +30,14 @@ void testUpdateType() {
         TypeEntity typeEntity = new TypeEntity();
         typeEntity.setId(1L);
         typeEntity.setType("jvm");
-        typeService.updateById(typeEntity);
+        ITypeService.updateById(typeEntity);
         System.out.println("修改成功");
     }
 
     // 查询题目类型
     @Test
     void testSelectType() {
-        List<TypeEntity> typeEntityList = typeService.list(new QueryWrapper<TypeEntity>().eq("id",1L));
+        List<TypeEntity> typeEntityList = ITypeService.list(new QueryWrapper<TypeEntity>().eq("id",1L));
         typeEntityList.forEach((item)-> {
             System.out.println(item);
         });
@@ -48,7 +47,7 @@ void testSelectType() {
     // 删除题目类型记录
     @Test
     void testRemoveType() {
-        typeService.removeById(1L);
+        ITypeService.removeById(1L);
         System.out.println("删除成功");
     }
 }

passjava-search/src/main/java/com/jackson0714/passjava/search/config/EsConstant.java

@@ -0,0 +1,12 @@
+package com.jackson0714.passjava.search.config;
+
+/**
+ * @Author: 公众号 | 悟空聊架构
+ * @Date: 2021/3/31 18:09
+ * @Site: www.passjava.cn
+ * @Github: https://github.com/Jackson0714/PassJava-Platform
+ */
+public class EsConstant {
+
+    public static final String QUESTION_INDEX = "question"; // 题目数据在 ES 中的索引
+}