临时提交

ssj-common-service/src/main/resources/application-common-test.properties

@@ -72,7 +72,7 @@ spring.rabbitmq.publisher-returns=true
 
 
 dubbo.registry.id=ssj-dubbo-registry
-dubbo.registry.address=zookeeper://39.108.210.183:2181
+dubbo.registry.address=zookeeper://172.18.106.198:2181
 dubbo.protocol.serialization=java
 dubbo.consumer.timeout=50000
 

ssj-kmt-exercise-api/src/main/java/com/ssj/aijia/kmt/exercise/controller/KmtExerciseController.java

@@ -22,7 +22,9 @@ import com.ssj.service.kmt.dto.exercise.ExerciseQuestionRollbacks;
 import com.ssj.service.kmt.exercise.request.SubmitAnswerProofreadResultReq;
 import com.ssj.service.kmt.request.*;
 import com.ssj.service.kmt.request.rollbackai.AddExerciseQuestionRequest;
+import com.ssj.service.kmt.request.rollbackai.ExerciseBooksEditRequest;
 import com.ssj.service.kmt.request.rollbackai.ExerciseQuestionDealRequest;
+import com.ssj.service.kmt.request.rollbackai.ExerciseQuestionsEditRequest;
 import com.ssj.service.kmt.service.*;
 import com.ssj.service.sys.homework.service.HomeworkService;
 import com.ssj.service.sys.picturepredeal.service.PicturePreDealService;
@@ -675,4 +677,32 @@ public class KmtExerciseController extends BaseController {
         return responseEntity;
     }
 
+    @RequestMapping(value = "/findEditExerciseBooks", method = RequestMethod.POST)
+    @ApiOperation(value = "题目修改查询练习册", httpMethod = "POST", notes = "题目修改查询练习册")
+    public ResponseEntity findEditExerciseBooks(@RequestParam(name = "accessToken") String accessToken,
+                                               @RequestBody ExerciseBooksEditRequest request) {
+        ResponseEntity responseEntity = new ResponseEntity();
+        try {
+            responseEntity = kmtExerciseQuestionDealService.findEditExerciseBooks(request);
+        } catch (Exception e) {
+            logger.error("异常", e);
+            responseEntity.failure(ResponseConstant.CODE_500, "系统繁忙，请稍后重试");
+        }
+        return responseEntity;
+    }
+
+    @RequestMapping(value = "/findEditExerciseQuestions", method = RequestMethod.POST)
+    @ApiOperation(value = "题目修改查询练习册", httpMethod = "POST", notes = "题目修改查询练习册")
+    public ResponseEntity findEditExerciseQuestions(@RequestParam(name = "accessToken") String accessToken,
+                                               @RequestBody ExerciseQuestionsEditRequest request) {
+        ResponseEntity responseEntity = new ResponseEntity();
+        try {
+            responseEntity = kmtExerciseQuestionDealService.findEditExerciseQuestions(request);
+        } catch (Exception e) {
+            logger.error("异常", e);
+            responseEntity.failure(ResponseConstant.CODE_500, "系统繁忙，请稍后重试");
+        }
+        return responseEntity;
+    }
+
 }

ssj-kmt-exercise-service-impl/src/main/java/com/ssj/service/kmt/kmt/service/impl/KmtExerciseQuestionDealServiceImpl.java

@@ -16,7 +16,9 @@ import com.ssj.framework.idworker.IdWorker;
 import com.ssj.framework.weixin.util.DateUtil;
 import com.ssj.kmt.utils.JSONFileUtil;
 import com.ssj.service.kmt.request.rollbackai.AddExerciseQuestionRequest;
+import com.ssj.service.kmt.request.rollbackai.ExerciseBooksEditRequest;
 import com.ssj.service.kmt.request.rollbackai.ExerciseQuestionDealRequest;
+import com.ssj.service.kmt.request.rollbackai.ExerciseQuestionsEditRequest;
 import com.ssj.service.kmt.service.KmtExerciseBookService;
 import com.ssj.service.kmt.service.KmtExerciseQuestionDealService;
 import com.ssj.service.kmt.service.KmtExerciseQuestionService;
@@ -366,4 +368,15 @@ public class KmtExerciseQuestionDealServiceImpl implements KmtExerciseQuestionDe
         return false;
     }
 
+
+    @Override
+    public ResponseEntity findEditExerciseBooks(ExerciseBooksEditRequest request) {
+
+        return null;
+    }
+
+    @Override
+    public ResponseEntity findEditExerciseQuestions(ExerciseQuestionsEditRequest request) {
+        return null;
+    }
 }

ssj-kmt-exercise-service/src/main/java/com/ssj/service/kmt/dto/exercise/ExerciseBookEditDto.java

@@ -0,0 +1,27 @@
+package com.ssj.service.kmt.dto.exercise;
+
+import java.io.Serializable;
+
+public class ExerciseBookEditDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String exerciseBookId;
+
+    private String exerciseBookName;
+
+    public String getExerciseBookId() {
+        return exerciseBookId;
+    }
+
+    public void setExerciseBookId(String exerciseBookId) {
+        this.exerciseBookId = exerciseBookId;
+    }
+
+    public String getExerciseBookName() {
+        return exerciseBookName;
+    }
+
+    public void setExerciseBookName(String exerciseBookName) {
+        this.exerciseBookName = exerciseBookName;
+    }
+}

ssj-kmt-exercise-service/src/main/java/com/ssj/service/kmt/request/rollbackai/ExerciseBooksEditRequest.java

@@ -0,0 +1,65 @@
+package com.ssj.service.kmt.request.rollbackai;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+public class ExerciseBooksEditRequest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(name = "subject", value = "科目", required = true)
+    private String  subject;
+
+    @ApiModelProperty(name = "versionType", value = "版本号", required = true)
+    private int  versionType;
+
+    @ApiModelProperty(name = "grade", value = "年级", required = true)
+    private String  grade;
+
+    @ApiModelProperty(name = "semester", value = "上下册，1上2下", required = true)
+    private String  semester;
+
+    @ApiModelProperty(name = "bookName", value = "练习册名称", required = false)
+    private String  bookName;
+
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public int getVersionType() {
+        return versionType;
+    }
+
+    public void setVersionType(int versionType) {
+        this.versionType = versionType;
+    }
+
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
+    public String getSemester() {
+        return semester;
+    }
+
+    public void setSemester(String semester) {
+        this.semester = semester;
+    }
+
+    public String getBookName() {
+        return bookName;
+    }
+
+    public void setBookName(String bookName) {
+        this.bookName = bookName;
+    }
+}

ssj-kmt-exercise-service/src/main/java/com/ssj/service/kmt/request/rollbackai/ExerciseQuestionsEditRequest.java

@@ -0,0 +1,43 @@
+package com.ssj.service.kmt.request.rollbackai;
+
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.NotBlank;
+
+import java.io.Serializable;
+
+public class ExerciseQuestionsEditRequest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(name = "exerciseBookId", value = "练习册id", required = true)
+    private String  exerciseBookId;
+
+    @ApiModelProperty(name = "pageNo", value = "页码", required = true)
+    private int  pageNo;
+
+    @ApiModelProperty(name = "pageSize", value = "每页条数", required = true)
+    private int  pageSize;
+
+    public String getExerciseBookId() {
+        return exerciseBookId;
+    }
+
+    public void setExerciseBookId(String exerciseBookId) {
+        this.exerciseBookId = exerciseBookId;
+    }
+
+    public int getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(int pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
+    }
+}

ssj-kmt-exercise-service/src/main/java/com/ssj/service/kmt/service/KmtExerciseQuestionDealService.java

@@ -2,7 +2,9 @@ package com.ssj.service.kmt.service;
 
 import com.ssj.framework.core.util.ResponseEntity;
 import com.ssj.service.kmt.request.rollbackai.AddExerciseQuestionRequest;
+import com.ssj.service.kmt.request.rollbackai.ExerciseBooksEditRequest;
 import com.ssj.service.kmt.request.rollbackai.ExerciseQuestionDealRequest;
+import com.ssj.service.kmt.request.rollbackai.ExerciseQuestionsEditRequest;
 
 public interface KmtExerciseQuestionDealService {
 
@@ -28,4 +30,19 @@ public interface KmtExerciseQuestionDealService {
      * @return
      */
     ResponseEntity moveExerciseQuestion(String userId, ExerciseQuestionDealRequest request);
+
+    /**
+     * 查询修改的练习册
+     * @param request
+     * @return
+     */
+    ResponseEntity findEditExerciseBooks(ExerciseBooksEditRequest request);
+
+
+    /**
+     * 查询待修改的题目
+     * @param request
+     * @return
+     */
+    ResponseEntity findEditExerciseQuestions (ExerciseQuestionsEditRequest request);
 }

ssj-mybatis-service-impl/src/main/java/com/ssj/service/mapper/KmtExerciseMapper.java

@@ -13,14 +13,12 @@ import com.ssj.service.conch.parents.v2.dto.TrainRecommendQuestionDTO;
 import com.ssj.service.kmt.dto.ExerciseBookDto;
 import com.ssj.service.kmt.dto.ExerciseQuetionDto;
 import com.ssj.service.kmt.dto.OriginalQuestionDTO;
-import com.ssj.service.kmt.dto.exercise.ExerciseQuestionRollbacks;
-import com.ssj.service.kmt.dto.exercise.ExerciseUnitBookcourseDto;
-import com.ssj.service.kmt.dto.exercise.KmtExerciseBookLibDto;
-import com.ssj.service.kmt.dto.exercise.KmtExerciseQuestionRollBackInfo;
+import com.ssj.service.kmt.dto.exercise.*;
 import com.ssj.service.kmt.exercisesys.dto.*;
 import com.ssj.service.kmt.exercisesys.request.*;
 import com.ssj.service.kmt.request.UnitAndPeriodListRequest;
 import com.ssj.service.kmt.request.rollbackai.AddExerciseQuestionRequest;
+import com.ssj.service.kmt.request.rollbackai.ExerciseBooksEditRequest;
 import com.ssj.service.sys.homework.vo.HomeworkExerciseBookDto;
 import org.apache.ibatis.annotations.*;
 
@@ -1222,4 +1220,6 @@ public interface KmtExerciseMapper {
     @Update("update kmt_exercise_questions set big_question_index=#{bigQuestionIndex} where parent_id=#{parentId}")
     int updateBigQuestionIndexByParentId (@Param("bigQuestionIndex") String bigQuestionIndex,
                                           @Param("parentId") String parentId);
+
+    List<ExerciseBookEditDto> findEditExerciseBooks (@Param("request")ExerciseBooksEditRequest request);
 }

ssj-mybatis-service-impl/src/main/resources/mybatis/mapper/KmtExerciseMapper.xml

@@ -2034,4 +2034,13 @@
             #{id}
         </foreach>
     </update>
+
+    <select id="findEditExerciseBooks" resultType="com.ssj.service.kmt.dto.exercise.ExerciseBookEditDto">
+        select distinct eb.id, eb.book_name from kmt_exercise_question_rollback rb, kmt_exercise_questions eq, kmt_exercise_book eb
+        where rb.question_id=eq.id and eq.exercise_book_id=eb.id and  rb.type=2 and eb.grade=#{request.grade}
+        and eb.course_name=#{request.subject}
+        and eb.version=#{request.versionType} and eb.semester=#{requset.semester}
+
+        and book_name regexp ''
+    </select>
 </mapper>