Merge branch 'master' of http://103.249.252.109:90/lcy/education

# Conflicts:
#	.gitignore
#	src/main/resources/application-dev.yml

.gitignore

 *.idea
 *.iml
 target/
-.settings/
-.classpath
-.project
-.gitignore
\ No newline at end of file
+application-dev.yml.bak
+logback-spring.xml.bak
\ No newline at end of file

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

@@ -81,7 +81,6 @@ public class BLessonServiceImpl implements BLessonService {
             model.setDefaultUrl(global.getDEFAULT_COURSE_LOCATION());
             UserUtil.setCurrentPersistOperation(model);
             line = bLessonRepository.insertSelective(model);
-
             //添加课程方向信息
             direction.setBusinessId(IdGen.uuid());
             direction.setLessionId(model.getBusinessId());

src/main/java/org/rcisoft/business/tquestion/controller/TQuestionController.java

@@ -5,6 +5,7 @@ package org.rcisoft.business.tquestion.controller;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.BindingResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -39,6 +40,7 @@ public class TQuestionController extends PaginationController<TQuestion> {
     @ApiOperation(value="添加", notes="添加")
     //@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
     @PostMapping
+    @PreAuthorize("hasRole('ROLE_1001')")
     public Result add(@Valid TQuestion tQuestion, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             throw new ServiceException(ResultServiceEnums.PARAMETER_ERROR.getCode(),
@@ -52,9 +54,10 @@ public class TQuestionController extends PaginationController<TQuestion> {
         tQuestion);
     }
 
-    @ApiOperation(value="逻辑删除", notes="逻辑删除")
-    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "id", required = false, dataType = "varchar")})
-    @DeleteMapping("/{id:\\d+}")
+    @ApiOperation(value="删除题目", notes="根据ID删除一个题")
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "businessId", required = false, dataType = "varchar")})
+    @PostMapping("/remove")
+    @PreAuthorize("hasRole('ROLE_1001')")
     public Result delete(@PathVariable String id) {
         TQuestion tQuestion = new TQuestion();
         tQuestion.setBusinessId(id);
@@ -69,6 +72,7 @@ public class TQuestionController extends PaginationController<TQuestion> {
     @ApiOperation(value="修改", notes="修改")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
     @PutMapping("/{id:\\d+}")
+    @PreAuthorize("hasRole('ROLE_1001')")
     public Result update(@Valid TQuestion tQuestion, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             throw new ServiceException(ResultServiceEnums.PARAMETER_ERROR.getCode(),
@@ -82,8 +86,9 @@ public class TQuestionController extends PaginationController<TQuestion> {
         tQuestion);
     }
 
-    @ApiOperation(value="查看单 ", notes="查看单 ")
-    @GetMapping("/{id:\\d+}")
+    @ApiOperation(value="唯一查找", notes="根据ID查找一条记录")
+    @GetMapping("/one")
+    @PreAuthorize("hasRole('ROLE_1001')")
     public Result detail(@PathVariable String id) {
         return Result.builder(new PersistModel(1),
             MessageConstant.MESSAGE_ALERT_SUCCESS,
@@ -91,14 +96,24 @@ public class TQuestionController extends PaginationController<TQuestion> {
         tQuestionServiceImpl.findById(id));
     }
 
-    @ApiOperation(value="查看  集合", notes="查看单  集合")
+    @ApiOperation(value="根据条件分页查询", notes="根据URL中的参数分页查询")
     @ApiImplicitParams({@ApiImplicitParam(name = "qtype" , value = "题目类型" , required = false , dataType = "varchar"),
         @ApiImplicitParam(name = "qtitle" , value = "关键字" , required = false , dataType = "varchar")})
     @GetMapping(value = "/queryTQuestionByPagination")
     public GridModel listByPagination(TQuestion tQuestion) {
         tQuestion.setCreateBy(UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID));
-
         tQuestionServiceImpl.findAllByPagination(getPaginationUtility(), tQuestion);
         return getGridModelResponse();
     }
+
+    @ApiOperation(value="根据条件查询", notes="根据URL中的参数查询全部")
+    @ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")
+    @GetMapping(value = "/queryTQestions")
+    public Result queryTQestion(TQuestion tQuestion) {
+        tQuestion.setCreateBy(UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID));
+        return Result.builder(new PersistModel(1),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                tQuestionServiceImpl.queryTQuestions(tQuestion));
+    }
 }

src/main/java/org/rcisoft/business/tquestion/dao/TQuestionRepository.java

 package org.rcisoft.business.tquestion.dao;
 
+import org.apache.ibatis.annotations.Insert;
+import org.rcisoft.business.tquestion.entity.TQuestionOptions;
 import org.rcisoft.core.base.BaseMapper;
 import org.rcisoft.business.tquestion.entity.TQuestion;
 import org.apache.ibatis.annotations.ResultMap;
@@ -26,6 +28,22 @@ public interface TQuestionRepository extends BaseMapper<TQuestion> {
             + "<if test=\"qtitle != null and qtitle != '' \">and qtitle LIKE CONCAT ('%',#{qtitle},'%')</if>"
             + "</script>")
     @ResultMap(value = "BaseResultMap" )
+    List<TQuestion> queryTQuestionsByPagination(TQuestion tQuestion);
+
+
+
+    @Insert("<script>INSERT INTO t_question_options (business_id,qid,alias,desc) VALUES " +
+            "(#{businessId},#{qid},#{alias},#{slId})</script>")
+    void insertQuestionOptions(TQuestionOptions model);
+
+
+    @Select("<script>select * "
+            +"from t_question tq"
+            +"left join t_question_options tqo on tqo.business_id = tq.business_id"
+            +"where 1=1"
+            +"<if test=\"delFlag !=null and delFlag != '' \">and del_flag = #{delFlag} </if> "
+            +"<if test=\"flag !=null and flag != '' \">and flag = #{flag} </if> "
+            +"<if test=\"business_id != null and business_id != ''\">and business_id = #{business_id}</if>")
     List<TQuestion> queryTQuestions(TQuestion tQuestion);
 }
 

src/main/java/org/rcisoft/business/tquestion/entity/TQuestion.java

@@ -34,6 +34,14 @@ public class TQuestion  extends IdEntity<TQuestion> {
 
      private String qanswer;
 
+     @Transient
+     private String qid;
+
+     @Transient
+     private String alias;
+
+     private String desc;
+
 
 }
 

src/main/java/org/rcisoft/business/tquestion/service/TQuestionService.java

@@ -48,6 +48,6 @@ public interface TQuestionService {
                                         TQuestion tQuestion);
 
 
-
+    List<TQuestion> queryTQuestions(TQuestion tQuestion);
 
 }

src/main/java/org/rcisoft/business/tquestion/service/impl/TQuestionServiceImpl.java

 package org.rcisoft.business.tquestion.service.impl;
 
+import org.rcisoft.business.tquestion.entity.TQuestionOptions;
+import org.rcisoft.core.constant.MessageConstant;
 import org.rcisoft.core.util.UserUtil;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
@@ -38,10 +40,16 @@ public class TQuestionServiceImpl implements TQuestionService {
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
     public PersistModel save(TQuestion tQuestion){
+        TQuestionOptions tQuestionOptions = new TQuestionOptions();
         tQuestion.setCommonBusinessId();
         //增加操作
         UserUtil.setCurrentPersistOperation(tQuestion);
         int line = tQuestionRepository.insertSelective(tQuestion);
+        //增加选项信息
+        tQuestionOptions.setQid(tQuestion.getQid());
+        tQuestionOptions.setAlias(tQuestion.getAlias());
+        tQuestionOptions.setDesc(tQuestion.getDesc());
+        tQuestionRepository.insertQuestionOptions(tQuestionOptions);
         log.info(UserUtil.getUserInfoProp(tQuestion.getToken(),UserUtil.USER_USERNAME)+"新增了ID为"+
             tQuestion.getBusinessId()+"的信息");
         return new PersistModel(line);
@@ -59,7 +67,7 @@ public class TQuestionServiceImpl implements TQuestionService {
         int line = tQuestionRepository.logicalDelete(tQuestion);
         log.info(UserUtil.getUserInfoProp(tQuestion.getToken(),UserUtil.USER_USERNAME)+"逻辑删除了ID为"+
         tQuestion.getBusinessId()+"的信息");
-        return new PersistModel(line);
+        return new PersistModel(line,MessageConstant.MESSAGE_ALERT_SUCCESS);
     }
 
     /**
@@ -95,6 +103,11 @@ public class TQuestionServiceImpl implements TQuestionService {
         TQuestion tQuestion){
         tQuestion.setStart();
         tQuestion.setNotDeleted();
+        return tQuestionRepository.queryTQuestionsByPagination(tQuestion);
+    }
+
+    @Override
+    public List<TQuestion> queryTQuestions(TQuestion tQuestion) {
         return tQuestionRepository.queryTQuestions(tQuestion);
     }
 

src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@ server:
 druid:
   url: jdbc:mysql://127.0.0.1:3306/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
   username: root
-  password: root
+  password: liuzhichao
   initial-size: 1
   min-idle: 1
   max-active: 20
@@ -104,7 +104,7 @@ global:
     min_password: 6
     max_password: 16
   path:
-    base_upload_server_location: E:\\eduServer
+    base_upload_server_location: /Users/liuzhichao/eduServer
     course_location: course
     lesson_location: lesson
     sl_location: sl
@@ -127,7 +127,7 @@ global:
     student_code_location: studentCode
   other:
     server_url:  http://gwf.natapp.cc/eduServer
-    is_server_linux: 5
+    is_server_linux: 1
     max_code_length: 15
   code:
     admin: ROLE_1001

src/main/resources/logback-spring.xml

@@ -5,7 +5,7 @@
     <appender name="consoleLog" class="ch.qos.logback.core.ConsoleAppender">
         <layout class="ch.qos.logback.classic.PatternLayout">
             <pattern>
-                %d - %msg%n
+                %date %-5level  %d - %msg%n
             </pattern>
         </layout>
     </appender>
@@ -56,7 +56,7 @@
     <logger name="org.springframework.aop.aspectj" level="ERROR"/>
 
     <springProfile name="dev">
-        <root level="info">
+        <root level="debug">
             <appender-ref ref="consoleLog" />
             <appender-ref ref="fileInfoLog" />
             <appender-ref ref="fileErrorLog" />