更新了问题提交

gis_domain/src/main/java/com/gis/domain/dto/AnswerRequest.java

@@ -23,9 +23,9 @@ public class AnswerRequest implements Serializable {
     @ApiModelProperty(value = "是否答案,1:是，0：否", required = true)
     private Integer correct;
 
-    @NotNull(message = "排号不能为空， 用1,2,3,4排序")
-    @ApiModelProperty(value = "排序", required = true)
-    private Integer sort;
+//    @NotNull(message = "排号不能为空， 用1,2,3,4排序")
+//    @ApiModelProperty(value = "排序", required = true)
+//    private Integer sort;
 
 
 

gis_domain/src/main/java/com/gis/domain/dto/QuestionRequest.java

@@ -32,15 +32,15 @@ public class QuestionRequest {
     @ApiModelProperty(value = "题目难度，1：简单，2：困难", required = true)
     private Integer level;
 
-    @NotBlank(message = "答案不能为空")
-    @ApiModelProperty(value = "答案id", required = true)
-    private String answerId;
+//    @NotBlank(message = "答案不能为空")
+//    @ApiModelProperty(value = "答案id", required = true)
+//    private String answerId;
 
     @ApiModelProperty(value = "相关知识点")
     private String related;
 
-//    @ApiModelProperty(value = "答案", required = true)
-//    private List<AnswerRequest> answers;
+    @ApiModelProperty(value = "答案", required = true)
+    private List<AnswerRequest> answers;
 
 
 

gis_mapper/src/main/java/com/gis/mapper/AnswerMapper.java

@@ -3,6 +3,7 @@ package com.gis.mapper;
 
 import com.gis.domain.po.AnswerEntity;
 import com.gis.mapper.provider.AnswerProvider;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
@@ -23,4 +24,7 @@ public interface AnswerMapper extends IBaseMapper<AnswerEntity, Long> {
 
     @SelectProvider(type = AnswerProvider.class, method = "setQuestionId")
     void setQuestionId(Long questionId, String answerIds);
+
+    @Delete("delete from tb_answer where question_id = #{questionId}")
+    void deleteByQuestionId(Long questionId);
 }

gis_service/src/main/java/com/gis/service/AnswerService.java

@@ -15,4 +15,6 @@ public interface AnswerService extends IBaseService<AnswerEntity, Long> {
     void setQuestionId(Long questionId, String answerIds);
 
     List<AnswerEntity> findByQuestionId(Long questionId);
+
+    void deleteByQuestionId(Long id);
 }

gis_service/src/main/java/com/gis/service/impl/AnswerServiceImpl.java

@@ -34,4 +34,9 @@ public class AnswerServiceImpl extends IBaseServiceImpl<AnswerEntity, Long> impl
     public List<AnswerEntity> findByQuestionId(Long questionId) {
         return entityMapper.findByQuestionId(questionId);
     }
+
+    @Override
+    public void deleteByQuestionId(Long questionId) {
+        entityMapper.deleteByQuestionId(questionId);
+    }
 }

gis_web/src/main/java/com/gis/web/aop/WebLogAspect.java

@@ -48,17 +48,19 @@ public class WebLogAspect {
 
         // 获取token
         String token = request.getHeader("token");
+        log.info("token: {}", token);
         // 排除登录接口
         boolean contains = request.getRequestURI().contains("/admin/login");
         if (contains) {
             return;
         }
 
-        Long userId = null;
-        if (token != null) {
-            userId = JwtUtil.getTokenLongValue(token, "id");
+        if (StringUtils.isBlank(token)) {
+            return;
         }
 
+        Long userId = null;
+        userId = JwtUtil.getTokenLongValue(token, "id");
 
         String description = getControllerLogDescription(joinPoint);
 

gis_web/src/main/java/com/gis/web/controller/IndexController.java

@@ -113,6 +113,7 @@ public class IndexController extends BaseController {
 
     }
 
+    @ApiOperation(value = "退出")
     @GetMapping("admin/logout")
     public Result logout() {
         String token = getToken();

gis_web/src/main/java/com/gis/web/controller/QuestionController.java

@@ -69,8 +69,23 @@ public class QuestionController extends BaseController {
             entity.setUpdateTime(new Date());
             questionService.update(entity);
 
+            // 每次修改把答案删除，重新添加答案
+            answerService.deleteByQuestionId(entity.getId());
+
+        }
+
+
+        // 添加答案
+        List<AnswerRequest> answers = param.getAnswers();
+        for (AnswerRequest an :answers) {
+            AnswerEntity answerEntity = new AnswerEntity();
+            BeanUtils.copyProperties(an, answerEntity);
+            answerEntity.setQuestionId(entity.getId());
+            answerService.save(answerEntity);
         }
-        answerService.setQuestionId(entity.getId(), param.getAnswerId());
+
+
+//        answerService.setQuestionId(entity.getId(), param.getAnswerId());
 
         return Result.success();
     }
@@ -87,11 +102,13 @@ public class QuestionController extends BaseController {
 
         List<AnswerEntity> answers = answerService.findByQuestionId(id);
 
-        HashMap<Object, Object> resultMap = new HashMap<>();
-        resultMap.put("question", entity);
-        resultMap.put("answer", answers);
+//        HashMap<Object, Object> resultMap = new HashMap<>();
+//        resultMap.put("question", entity);
+//        resultMap.put("answer", answers);
+
+        entity.setAnswers(answers);
 
-        return Result.success(resultMap);
+        return Result.success(entity);
     }
 
     @WebControllerLog(description = "题库管理-删除")
@@ -103,32 +120,32 @@ public class QuestionController extends BaseController {
     }
 
 
-    @WebControllerLog(description = "题库管理-新增/修改答案")
-    @ApiOperation("新增/修改答案")
-    @PostMapping("answer")
-    public Result answer(@RequestBody AnswerRequest param) {
-
-        AnswerEntity entity = null;
-
-
-        Long id = param.getId();
-        if (id == null) {
-            entity = new AnswerEntity();
-            BeanUtils.copyProperties(param, entity);
-            answerService.save(entity);
-        } else {
-            entity = answerService.findById(param.getId());
-            if (entity == null) {
-                log.error("对象不存在： {}", id);
-                return Result.failure("对象不存在");
-            }
-
-            BeanUtils.copyProperties(param, entity);
-            entity.setUpdateTime(new Date());
-            answerService.update(entity);
-        }
-
-        return Result.success(entity);
-    }
+//    @WebControllerLog(description = "题库管理-新增/修改答案")
+//    @ApiOperation("新增/修改答案")
+//    @PostMapping("answer")
+//    public Result answer(@RequestBody AnswerRequest param) {
+//
+//        AnswerEntity entity = null;
+//
+//
+//        Long id = param.getId();
+//        if (id == null) {
+//            entity = new AnswerEntity();
+//            BeanUtils.copyProperties(param, entity);
+//            answerService.save(entity);
+//        } else {
+//            entity = answerService.findById(param.getId());
+//            if (entity == null) {
+//                log.error("对象不存在： {}", id);
+//                return Result.failure("对象不存在");
+//            }
+//
+//            BeanUtils.copyProperties(param, entity);
+//            entity.setUpdateTime(new Date());
+//            answerService.update(entity);
+//        }
+//
+//        return Result.success(entity);
+//    }
 
 }