Signed-off-by: ljx <809268652@qq.com>

src/main/java/com/tocean/app/controller/admin/LevelController.java

@@ -33,4 +33,18 @@ public class LevelController {
         return BaseResponse.success(levelService.page(request.getPage(),request.getLimit(),request.getData()));
     }
 
+    @GetMapping("/{id}")
+    public BaseResponse<BasePageResponse<Level>> getGqInfo(@PathVariable("id") String id){
+        return BaseResponse.success(levelService.getGqInfo(id));
+    }
+
+    @PostMapping
+    public BaseResponse<Integer> addGq(@RequestBody Level level){
+        return BaseResponse.success(levelService.addGq(level));
+    }
+
+    @PutMapping
+    public BaseResponse<Integer> updateGq(@RequestBody Level level){
+        return BaseResponse.success(levelService.updateGq(level));
+    }
 }

src/main/java/com/tocean/app/controller/admin/LevelTimuController.java

@@ -1,13 +1,12 @@
 package com.tocean.app.controller.admin;
 
+import com.tocean.app.controller.request.LevelTimuOperateRequest;
 import com.tocean.app.controller.request.LevelTimuRequest;
-import com.tocean.app.controller.request.datadict.DataDictSearchDto;
-import com.tocean.app.dto.request.BasePageRequest;
 import com.tocean.app.dto.request.BaseRequest;
 import com.tocean.app.dto.response.BasePageResponse;
 import com.tocean.app.dto.response.BaseResponse;
+import com.tocean.app.entity.Level;
 import com.tocean.app.entity.LevelTimu;
-import com.tocean.app.entity.common.DataDict;
 import com.tocean.app.service.LevelTimuService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,6 +19,7 @@ import java.util.List;
 
 @Api(description = "题目")
 @Slf4j
+@CrossOrigin
 @RestController("LevelTimuController")
 @RequestMapping("/admin/levelTimu")
 public class LevelTimuController {
@@ -30,16 +30,62 @@ public class LevelTimuController {
     @ApiOperation(value = "查询题目")
     @PostMapping("/detail")
     public BaseResponse<BasePageResponse<LevelTimu>> page(@Valid @RequestBody BaseRequest<LevelTimuRequest> request) {
-        levelTimuService.getTimu(request.getData().getLevel_id(),request.getData().getTimu_id());
+        levelTimuService.getTimu(request.getData().getLevel_id());
         return BaseResponse.success();
     }
 
+    /**
+     * 新增
+     */
+    @PostMapping("/add")
+    public BaseResponse<Integer> addTiMu(@RequestBody LevelTimu levelTimu)
+    {
+        return BaseResponse.success(levelTimuService.addTiMu(levelTimu));
+    }
+
+    @GetMapping("/{id}")
+    public BaseResponse<LevelTimu> getTmInfo(@PathVariable("id") String id){
+        return BaseResponse.success(levelTimuService.getTmInfo(id));
+    }
+
+    /**
+     * 修改
+     */
+    @PutMapping
+    public BaseResponse<Integer> updateTiMu(@RequestBody LevelTimu levelTimu)
+    {
+
+        return BaseResponse.success(levelTimuService.updateTiMu(levelTimu));
+    }
+
+    /**
+     * 删除
+     */
+    @DeleteMapping("/{timuId}")
+    public BaseResponse<Integer> removeTiMu(@PathVariable String timuId)
+    {
+        return BaseResponse.success(levelTimuService.removeTiMu(timuId));
+    }
+
     @ApiOperation(value = "查询关卡关联的题目")
     @GetMapping("/{levelId}/link")
-    public BaseResponse<List<String>> page(@PathVariable("levelId") String levelId) {
+    public BaseResponse<List<LevelTimu>> page(@PathVariable("levelId") String levelId) {
         return BaseResponse.success(levelTimuService.link(levelId));
     }
     //todo 关联接口
-
+    @ApiOperation(value = "关联接口")
+    @PostMapping
+    public BaseResponse<?> Related(@RequestBody BaseRequest<LevelTimuOperateRequest> operateDto) {
+        System.out.println(operateDto);
+        levelTimuService.Related(operateDto.getData().getLevelId(), operateDto.getData().getTimuId());
+        return BaseResponse.success();
+    }
     //todo 取消关联接口
+    @ApiOperation(value = "取消关联")
+    @PostMapping("/association/delete")
+    public BaseResponse<?>  delete(@RequestBody  BaseRequest<LevelTimuOperateRequest> operateDto) {
+        System.out.println(operateDto);
+        levelTimuService.delete(operateDto.getData().getLevelId(),operateDto.getData().getTimuId());
+        return BaseResponse.success();
+    }
 }

src/main/java/com/tocean/app/controller/admin/PaperController.java

@@ -1,43 +0,0 @@
-package com.tocean.app.controller.admin;
-
-import com.tocean.app.controller.request.PaperOperateRequest;
-import com.tocean.app.controller.request.datadict.DataDictOperateDto;
-import com.tocean.app.dto.request.BasePageRequest;
-import com.tocean.app.dto.request.BaseRequest;
-import com.tocean.app.dto.response.BasePageResponse;
-import com.tocean.app.dto.response.BaseResponse;
-import com.tocean.app.entity.Paper;
-import com.tocean.app.service.PaperService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-
-@Api(description = "试卷")
-@Slf4j
-@RestController("PaperController")
-@RequestMapping("/admin/paper")
-public class PaperController {
-
-    @Autowired
-    private PaperService paperService;
-
-    @ApiOperation(value = "新增试卷")
-    @PostMapping
-    public BaseResponse<?> saveOrUpdate(@Valid @RequestBody BaseRequest<PaperOperateRequest> request) {
-        paperService.save(request.getData().getName(),request.getData().getGradeName(),request.getData().getSubject());
-        return BaseResponse.success();
-    }
-
-    @ApiOperation(value = "分页查询试卷")
-    @PostMapping("/page")
-    public BaseResponse<BasePageResponse<Paper>> page(@Valid @RequestBody BasePageRequest<PaperOperateRequest> request) {
-        return BaseResponse.success(paperService.page(request.getPage(),request.getLimit(),request.getData()));
-    }
-}

src/main/java/com/tocean/app/controller/admin/StudentController.java

@@ -0,0 +1,63 @@
+package com.tocean.app.controller.admin;
+
+import com.tocean.app.dto.response.BaseResponse;
+import com.tocean.app.entity.Student;
+import com.tocean.app.service.StudentService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(description = "登录测试")
+@Slf4j
+@RestController("StudentController")
+@RequestMapping("/admin/student")
+public class StudentController {
+
+    @Autowired
+    private StudentService studentService;
+    @ApiOperation(value = "登录页面")
+    @PostMapping("/login")
+//    public String login(@RequestParam("name") String name, @RequestParam("password") String password) {
+    public BaseResponse<?> login(@RequestBody Student stu){
+        Student student= studentService.login(stu.getName());
+        if(student==null){
+            return BaseResponse.failure(411,"账号错误");
+        }else if (student.getPassword().equals(stu.getPassword())){
+             return BaseResponse.success("登录成功");
+        }
+        return BaseResponse.failure(410,"密码错误");
+    }
+    @ApiOperation(value = "注册账号1")
+    @PostMapping("/regis1")
+    public BaseResponse<?> saveInsert(@RequestParam("name") String name, @RequestParam("password") String password) {
+        studentService.saveInsert(name, password);
+        return BaseResponse.success();
+    }
+    @ApiOperation(value = "注册账号2")
+    @PostMapping("/regis2")
+//    public BaseResponse<?> regis(@Valid @RequestBody BaseRequest<StudentOperateRequest> request) {
+//        studentService.regis(request.getData());
+//        return BaseResponse.success();
+//    }
+    public String regis(@RequestBody Student stu){
+        Student student=studentService.regis1(stu.getName());
+        if(student.getName().equals(stu.getName())){
+            return "账号已存在";
+        }else{
+            studentService.regis(stu.getName(),stu.getPassword());
+            return"注册成功" ;
+        }
+
+    }
+
+    @ApiOperation(value = "查询用户")
+    @PostMapping("/select")
+    public BaseResponse<List<Student>> selectUser(){
+        return BaseResponse.success(studentService.selectUser());
+    }
+
+}

src/main/java/com/tocean/app/controller/request/LevelTimuOperateRequest.java

@@ -0,0 +1,26 @@
+package com.tocean.app.controller.request;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+@ApiModel("关卡测试")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class LevelTimuOperateRequest {
+
+    @ApiModelProperty("levelId")
+    @TableField(value = "level_id")
+    private String levelId;
+
+    @ApiModelProperty("TimuID")
+    @TableField(value = "Timu_id")
+    private String TimuId;
+
+}

src/main/java/com/tocean/app/controller/request/StudentOperateRequest.java

@@ -0,0 +1,29 @@
+package com.tocean.app.controller.request;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+@ApiModel("登录测试")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class StudentOperateRequest {
+    @ApiModelProperty("id")
+    @TableField(value = "id")
+    private String id;
+
+    @ApiModelProperty("name")
+    @TableField(value = "名字")
+    private String name;
+
+    @ApiModelProperty("password")
+    @TableField(value = "密码")
+    private String password;
+
+}

src/main/java/com/tocean/app/entity/BaseEntity.java

@@ -62,7 +62,6 @@ public abstract class BaseEntity implements Serializable {
 
     @ApiModelProperty("是否删除")
     @NotNull
-    @TableLogic
     @TableField(value = "is_del", fill = FieldFill.INSERT)
     private Boolean isDel;
 

src/main/java/com/tocean/app/entity/Level.java

@@ -19,6 +19,6 @@ import lombok.experimental.Accessors;
 public class Level extends BaseEntity{
 
     @ApiModelProperty("关卡名称")
-    @TableField(value = "name")
-    private String name;
+    @TableField(value = "gqname")
+    private String gqname;
 }

src/main/java/com/tocean/app/entity/LevelTimu.java

@@ -1,11 +1,14 @@
 package com.tocean.app.entity;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -16,7 +19,8 @@ import lombok.experimental.Accessors;
 @AllArgsConstructor
 @Accessors(chain = true)
 @TableName("t_level_timu")
-public class LevelTimu extends BaseEntity {
+@Builder
+public class LevelTimu {
 
     @ApiModelProperty("关卡id")
     @TableField(value = "level_id")
@@ -24,5 +28,19 @@ public class LevelTimu extends BaseEntity {
 
     @ApiModelProperty("题目id")
     @TableField(value = "timu_id")
+    @TableId(type = IdType.AUTO)
     private String timuId;
+
+    @ApiModelProperty("题目内容")
+    @TableField(value = "content")
+    private String content;
+
+    @ApiModelProperty("答案")
+    @TableField(value = "answer")
+    private String answer;
+
+    @ApiModelProperty("答案解析")
+    @TableField(value = "analysis")
+    private String analysis;
+
 }

src/main/java/com/tocean/app/entity/Paper.java → src/main/java/com/tocean/app/entity/Student.java

@@ -1,8 +1,8 @@
 package com.tocean.app.entity;
 
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -10,23 +10,23 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
-@ApiModel("试卷实体")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@ApiModel("登录测试")
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)
-@TableName("t_paper")
-public class Paper extends BaseEntity{
+@TableName(value = "student")
+public class Student {
+    @ApiModelProperty("id")
+    @TableField(value = "id")
+    private String id;
 
-    @ApiModelProperty("试卷名称")
+    @ApiModelProperty("名字")
     @TableField(value = "name")
-    private String name;
-
-    @ApiModelProperty("年级")
-    @TableField(value = "grade_name")
-    private String gradeName;
+    private String Name;
 
-    @ApiModelProperty("学科")
-    @TableField(value = "subject")
-    private String subject;
+    @ApiModelProperty("密码")
+    @TableField(value = "password")
+    private String password;
 }

src/main/java/com/tocean/app/mapper/LevelMapper.java

@@ -17,5 +17,9 @@ public interface LevelMapper extends BaseMapper<Level> {
 
     IPage<Level> page(Page<?> page, @Param("request") LevelGetListRequest levelGetListRequest);
 
+    Level getGqInfo(String id);
 
+    int addGq(Level level);
+
+    int updateGq(Level level);
 }

src/main/java/com/tocean/app/mapper/LevelTimuMapper.java

@@ -16,4 +16,5 @@ import org.springframework.stereotype.Repository;
 public interface LevelTimuMapper extends BaseMapper<LevelTimu> {
     IPage<LevelTimu> page(Page<?> page, @Param("request") LevelTimuRequest levelTimuRequest);
 
+    LevelTimu getTmInfo(String id);
 }

src/main/java/com/tocean/app/mapper/PaperMapper.java → src/main/java/com/tocean/app/mapper/StudentMapper.java

@@ -3,16 +3,15 @@ package com.tocean.app.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tocean.app.controller.request.PaperOperateRequest;
-import com.tocean.app.entity.Paper;
-import org.apache.ibatis.annotations.Mapper;
+import com.tocean.app.controller.request.StudentOperateRequest;
+import com.tocean.app.entity.Student;
 import org.apache.ibatis.annotations.Param;
+import org.mapstruct.Mapper;
 import org.springframework.stereotype.Repository;
 
 @Mapper
 @Repository
-public interface PaperMapper extends BaseMapper<Paper> {
-
-    IPage<Paper> page(Page<?> page, @Param("request")PaperOperateRequest request);
+public interface StudentMapper extends BaseMapper<Student> {
+    IPage<Student> getList(Page<?> page, @Param("request") StudentOperateRequest request);
 
 }

src/main/java/com/tocean/app/service/LevelService.java

@@ -17,7 +17,7 @@ public class LevelService {
 
    public void getList(String name){
        Level level = new Level();
-       level.setName(name);//关卡名称
+       level.setGqname(name);//关卡名称
 
        levelMapper.insert(level);
 
@@ -28,5 +28,16 @@ public class LevelService {
         return new BasePageResponse().setTotal(list.getTotal()).setData(list.getRecords());
     }
 
+    public BasePageResponse<Level> getGqInfo(String id){
+       return new BasePageResponse().setData(levelMapper.getGqInfo(id));
+    }
+
+    public int addGq(Level level){
+       return levelMapper.addGq(level);
+    }
+
+    public int updateGq(Level level){
+       return levelMapper.updateGq(level);
+    }
 
 }

src/main/java/com/tocean/app/service/LevelTimuService.java

@@ -9,6 +9,9 @@ import com.tocean.app.entity.LevelTimu;
 import com.tocean.app.mapper.LevelTimuMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -19,11 +22,10 @@ public class LevelTimuService {
     @Autowired
     private LevelTimuMapper levelTimuMapper;
 
-    public void getTimu(String level_id, String timu_id) {
-        LevelTimu levelTimu = new LevelTimu();
-        levelTimu.setLevelId(level_id);//关卡id
-        levelTimu.setTimuId(timu_id);//题目id
-        levelTimuMapper.insert(levelTimu);
+    public List<LevelTimu> getTimu(String levelID) {
+        List<LevelTimu> levelTimu = levelTimuMapper.selectList(new QueryWrapper<LevelTimu>()
+                .eq("level_id", levelID));
+        return levelTimu;
     }
 
     public BasePageResponse<LevelTimu> page(Integer page, Integer size, LevelTimuRequest request) {
@@ -32,10 +34,52 @@ public class LevelTimuService {
         return new BasePageResponse().setTotal(list.getTotal()).setData(list.getRecords());
     }
 
-    public List<String> link(String levelId) {
-        return levelTimuMapper.selectList(new QueryWrapper<LevelTimu>().lambda()
-                .eq(LevelTimu::getLevelId, levelId)
-        ).stream().map(p -> p.getTimuId()).collect(Collectors.toList());
+    public List<LevelTimu> link(String levelId) {
+        return levelTimuMapper.selectList(new QueryWrapper<LevelTimu>().eq("level_id",levelId));
     }
 
+    public LevelTimu getTmInfo(String id){
+        return levelTimuMapper.getTmInfo(id);
+    }
+
+    public int addTiMu(LevelTimu levelTimu){
+        return levelTimuMapper.insert(levelTimu);
+    }
+
+    public int updateTiMu(LevelTimu levelTimu){
+        return levelTimuMapper.updateById(levelTimu);
+    }
+
+    public int removeTiMu(String timuId){
+        return levelTimuMapper.deleteById(timuId);
+    }
+
+    //建立关联
+    public boolean Related(@RequestBody String levelId, String timuId){
+        LevelTimu levelTimu=new LevelTimu();
+        int i=0;
+        levelTimu.setLevelId(levelId);
+        levelTimu.setTimuId(timuId);
+        i=levelTimuMapper.insert(levelTimu);
+        if(i>0){
+            return true;
+        }else{
+            return false;
+        }
+    }
+    //取消关联
+    @Transactional
+    public boolean delete(String levelId,String TimuId) {
+        List<LevelTimu> level = levelTimuMapper.selectList(new QueryWrapper<LevelTimu>().eq("level_id",levelId).eq("timu_id", TimuId).eq("is_Del",0));
+        int i=0;
+        if (!ObjectUtils.isEmpty(level)) {
+            i=levelTimuMapper.delete(new QueryWrapper<LevelTimu>().eq("level_id",levelId).eq("timu_id", TimuId).eq("is_Del",0));
+        }
+        if (i>0){
+            return true;
+        }else {
+            return false;
+        }
+    }
 }
+

src/main/java/com/tocean/app/service/PaperService.java

@@ -1,34 +0,0 @@
-package com.tocean.app.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tocean.app.controller.request.PaperOperateRequest;
-import com.tocean.app.dto.response.BasePageResponse;
-import com.tocean.app.entity.Paper;
-import com.tocean.app.mapper.PaperMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class PaperService {
-
-    @Autowired
-    private PaperMapper paperMapper;
-
-    public void save(String name,String gradeName,String subject){
-        Paper paper = new Paper();
-        paper.setName(name);//试卷名称
-        paper.setGradeName(gradeName);//年纪
-        paper.setSubject(subject);//学科
-
-        paperMapper.insert(paper);
-
-    }
-
-    public BasePageResponse<Paper> page(Integer page, Integer limit, PaperOperateRequest request){
-        Page<Paper> _page = new Page (page,limit);
-        IPage<Paper> list = paperMapper.page(_page,request);
-        return new BasePageResponse().setTotal(list.getTotal()).setData(list.getRecords());
-    }
-
-}

src/main/java/com/tocean/app/service/StudentService.java

@@ -0,0 +1,54 @@
+package com.tocean.app.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.tocean.app.entity.Student;
+import com.tocean.app.mapper.StudentMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class StudentService {
+
+    @Autowired
+    private StudentMapper studentMapper;
+
+    public Student login(String studentid){
+        return studentMapper.selectOne(new QueryWrapper<Student>().eq("name",studentid));
+    }
+    public void saveInsert(String name,String password){
+        Student student=new Student();
+        student.setName(name);
+        student.setPassword(password);
+        studentMapper.insert(student);
+
+    }
+//    public String regis(StudentOperateRequest request){
+//        Student student=new Student();
+//        if (StringUtils.isEmpty(request.getName())){
+//            return "用户名不能为空";
+//        }else if (request.getName()==student.getName()){
+//            return "用户名已存在";
+//        }else if (!StringUtils.isEmpty(request.getName())&&!StringUtils.isEmpty(request.getPassword())){
+//            student.setName(request.getName());
+//            student.setPassword(request.getPassword());
+//            studentMapper.insert(student);
+//        }
+//    return "注册成功";
+//    }
+    public Student regis1(String name){
+        return studentMapper.selectOne(new QueryWrapper<Student>().eq("name",name));
+    }
+    public int regis(String  name,String password) {
+    Student student = new Student();
+    student.setName(name);
+    student.setPassword(password);
+  return studentMapper.insert(student);
+
+}
+    public List<Student> selectUser(){
+        List<Student> student = studentMapper.selectList(null);
+        return  student;
+    }
+}

src/main/resources/application-prod.yaml

@@ -1,11 +1,11 @@
 server:
-  port: 8080
+  port: 19090
 
 spring:
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/base-in-back-end?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://114.116.114.108:3306/base-in-back-end?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: root
-    password:
+    password: ydl@123456
   redis:
     host:
     port:

src/main/resources/application.yaml

@@ -30,7 +30,7 @@ logging:
 
 spring:
   profiles:
-    active: dev
+    active: prod
   output:
     ansi:
       enabled: DETECT # 会检查终端是否支持ANSI，是的话就采用彩色输出

src/main/resources/mapper/LevelMapper.xml

@@ -15,4 +15,32 @@
         ORDER BY l.id ASC
     </select>
 
+    <select id="getGqInfo" resultType="com.tocean.app.entity.Level">
+        SELECT * FROM t_level l WHERE l.id = #{id}
+    </select>
+
+    <insert id="addGq" parameterType="com.tocean.app.entity.Level">
+        insert into t_level
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="gqname != null">gqname,</if>
+            <if test="createDate != null">create_time,</if>
+            <if test="lastModifiedDate != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="gqname != null">#{gqname},</if>
+            <if test="createDate != null">#{createDate},</if>
+            <if test="lastModifiedDate != null">#{lastModifiedDate},</if>
+        </trim>
+    </insert>
+
+    <update id="updateGq" parameterType="com.tocean.app.entity.Level">
+        update t_level
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="gqname != null">gqname = #{gqname},</if>
+            <if test="lastModifiedDate != null">update_time = #{lastModifiedDate},</if>
+        </trim>
+        where id = #{id}
+    </update>
 </mapper>

src/main/resources/mapper/LevelTimuMapper.xml

@@ -16,4 +16,9 @@
         ORDER BY lt.id ASC
     </select>
 
+    <select id="getTmInfo" resultType="com.tocean.app.entity.LevelTimu">
+        SELECT * FROM t_level_timu lt
+        WHERE lt.timu_id = #{id}
+    </select>
+
 </mapper>

src/main/resources/mapper/PaperMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.tocean.app.mapper.PaperMapper">
-    <select id="page" resultType="com.tocean.app.entity.Paper">
-        SELECT * FROM t_paper p
-        <where>
-            <if test="request.name != null and request.name !=''">
-                AND p.name LIKE CONCAT('%', #{request.name}, '%')
-            </if>
-            <if test="request.gradeName != null and request.gradeName !=''">
-                AND p.grade_name = ('%', #{request.gradeName}, '%')
-            </if>
-            <if test="request.subject != null and request.subject !=''">
-                AND p.subject = #{request.subject}
-            </if>
-            <if test="request.isDel != null">
-                AND p.is_del = #{request.isDel}
-            </if>
-        </where>
-        ORDER BY p.id DESC
-    </select>
-
-</mapper>

src/test/java/com/tocean/app/service/LevelTimuServiceTest.java

@@ -16,8 +16,7 @@ public class LevelTimuServiceTest {
     @Test
     public void getList() {
        String level_id = "关卡id";
-       String timu_id = "题目id";
-        levelTimuService.getTimu(level_id,timu_id);
+        levelTimuService.getTimu(level_id);
 
         
 

src/test/java/com/tocean/app/service/PaperServiceTest.java

@@ -1,29 +0,0 @@
-package com.tocean.app.service;
-
-import com.tocean.app.mapper.PaperMapper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import static org.junit.Assert.*;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class PaperServiceTest {
-
-    @Autowired
-    private PaperService paperService;
-
-    @Test
-    public void save() {
-       String name = "试卷名称";
-       String gradeName = "年级";
-       String object = "学科";
-       paperService.save(name,gradeName,object);
-
-
-
-    }
-}