小么熊🐻 il y a 3 ans
Parent
commit
afe0cd6b25

+ 1 - 1
jkt-admin/src/main/java/com/miaxis/app/controller/AdInfoController.java → jkt-admin/src/main/java/com/miaxis/app/controller/ad/AdInfoController.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.controller;
+package com.miaxis.app.controller.ad;
 
 import com.miaxis.ad.domain.AdInfo;
 import com.miaxis.ad.service.IAdInfoService;

+ 1 - 2
jkt-admin/src/main/java/com/miaxis/app/controller/QuestionCollectionController.java → jkt-admin/src/main/java/com/miaxis/app/controller/question/QuestionCollectionController.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.controller;
+package com.miaxis.app.controller.question;
 
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;
@@ -77,7 +77,6 @@ public class QuestionCollectionController extends BaseController{
     /**
      * 新增collection
      */
-//    @PreAuthorize("@ss.hasPermi('question:collection:add')")
     @Log(title = "collection", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("新增collection")

+ 1 - 1
jkt-admin/src/main/java/com/miaxis/app/controller/QuestionVersionController.java → jkt-admin/src/main/java/com/miaxis/app/controller/question/QuestionVersionController.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.controller;
+package com.miaxis.app.controller.question;
 
 import com.miaxis.common.constant.Constants;
 import java.util.List;

+ 5 - 2
jkt-admin/src/main/java/com/miaxis/app/controller/QuestionWrongController.java → jkt-admin/src/main/java/com/miaxis/app/controller/question/QuestionWrongController.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.controller;
+package com.miaxis.app.controller.question;
 
 import com.miaxis.common.constant.Constants;
 
@@ -9,6 +9,7 @@ import java.util.Arrays;
 import com.miaxis.question.domain.QuestionCollection;
 import com.miaxis.question.dto.QuestionCollectionDTO;
 import com.miaxis.question.dto.QuestionWrongDTO;
+import com.miaxis.score.domain.ScoreInfo;
 import io.swagger.annotations.*;
 import com.miaxis.common.core.domain.Response;
 import org.springframework.beans.BeanUtils;
@@ -79,7 +80,9 @@ public class QuestionWrongController extends BaseController{
     @Log(title = "wrong", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("新增wrong")
-    public Response<Integer> add(@RequestBody QuestionWrong questionWrong){
+    public Response<Integer> add(@RequestBody QuestionWrongDTO questionWrongDTO){
+        QuestionWrong questionWrong = new QuestionWrong();
+        BeanUtils.copyProperties(questionWrongDTO,questionWrong);
         return toResponse(questionWrongService.save(questionWrong) ? 1 : 0);
     }
 

+ 7 - 2
jkt-admin/src/main/java/com/miaxis/app/controller/ScoreInfoController.java → jkt-admin/src/main/java/com/miaxis/app/controller/score/ScoreInfoController.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.controller;
+package com.miaxis.app.controller.score;
 
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;
@@ -7,9 +7,12 @@ import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.enums.BusinessTypeEnum;
 import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.question.domain.QuestionCollection;
 import com.miaxis.score.domain.ScoreInfo;
+import com.miaxis.score.dto.ScoreInfoDTO;
 import com.miaxis.score.service.IScoreInfoService;
 import io.swagger.annotations.*;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -65,7 +68,9 @@ public class ScoreInfoController extends BaseController{
     @Log(title = "模拟考成绩", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("新增模拟考成绩")
-    public Response<Integer> add(@RequestBody ScoreInfo scoreInfo){
+    public Response<Integer> add(@RequestBody ScoreInfoDTO scoreInfoDTO){
+        ScoreInfo scoreInfo = new ScoreInfo();
+        BeanUtils.copyProperties(scoreInfoDTO,scoreInfo);
         return toResponse(scoreInfoService.save(scoreInfo) ? 1 : 0);
     }
 

+ 38 - 0
jkt-service/src/main/java/com/miaxis/score/dto/ScoreInfoDTO.java

@@ -0,0 +1,38 @@
+package com.miaxis.score.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 模拟考成绩对象 score_info
+ *
+ * @author miaxis
+ * @date 2021-08-23
+ */
+@Data
+public class ScoreInfoDTO extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+
+    /** 用户ID */
+    private Long userId;
+
+    /** 考试车型 */
+    private String type;
+
+    /** 考试科目 */
+    private String kskm;
+
+    /** 分数 */
+    private Long score;
+
+
+}