整理代码

src/main/java/org/rcisoft/business/bsl/service/impl/BSlServiceImpl.java

@@ -282,6 +282,7 @@ public class BSlServiceImpl implements BSlService {
         BSl bsl = new BSl();
         bsl.setBusinessId(id);
         UserUtil.setCurrentMergeOperation(bsl);
+        bSl.setDeleted();
         int line = bSlRepository.logicalDelete(bSl);
         //int line = bSlRepository.deleteByPrimaryKey(id);
         return new PersistModel(line);

src/main/java/org/rcisoft/business/bstudent/service/impl/BStudentServiceImpl.java

@@ -254,6 +254,7 @@ public class BStudentServiceImpl implements BStudentService {
         }
         BStudent bStudent = new BStudent();
         bStudent.setBusinessId(id);
+        bStudent.setDeleted();
         UserUtil.setCurrentMergeOperation(bStudent);
         BStudent student = bStudentRepository.selectOne(bStudent);
         sysUserMapper.deleteByCode(student.getCode());

src/main/java/org/rcisoft/business/bteacher/entity/BTeacher.java

@@ -3,6 +3,7 @@ package org.rcisoft.business.bteacher.entity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
 import org.rcisoft.core.entity.IdEntity;
 
 import javax.persistence.Entity;
@@ -40,6 +41,7 @@ public class BTeacher extends IdEntity<BTeacher> {
     private String recommendCourse;
 
     @Transient
+    @Length(min = 1,max = 200,message = "长度最小为1,最大为15")
     private String name;
 
     @Transient

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.json.JSONArray;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.BindingResult;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +31,7 @@ import java.util.List;
 * Created by yangzhaojun on 2018-1-15 19:49:07.
 */
 @RestController
-@RequestMapping("/t/question")
+@RequestMapping("/tQuestion")
 public class TQuestionController extends PaginationController<TQuestion> {
 
     @Autowired
@@ -40,14 +41,9 @@ 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(),
-                bindingResult.getFieldError().getDefaultMessage());
-        }
-        tQuestion.setToken(getToken());
-        PersistModel data = tQuestionServiceImpl.save(tQuestion);
+    @PreAuthorize("hasRole('ROLE_1002')")
+    public Result add(@Valid TQuestion tQuestion, String[] questionOptions) {
+        PersistModel data = tQuestionServiceImpl.save(tQuestion,questionOptions);
         return Result.builder(data,
             MessageConstant.MESSAGE_ALERT_SUCCESS,
             MessageConstant.MESSAGE_ALERT_ERROR,
@@ -59,11 +55,7 @@ public class TQuestionController extends PaginationController<TQuestion> {
     @PostMapping("/remove")
     @PreAuthorize("hasRole('ROLE_1001')")
     public Result delete(@PathVariable String id) {
-        TQuestion tQuestion = new TQuestion();
-        tQuestion.setBusinessId(id);
-        tQuestion.setToken(getToken());
-        PersistModel data = tQuestionServiceImpl.remove(tQuestion);
-        return Result.builder(data,
+        return Result.builder(new PersistModel(tQuestionServiceImpl.remove(id,getToken())),
             MessageConstant.MESSAGE_ALERT_SUCCESS,
             MessageConstant.MESSAGE_ALERT_ERROR,
         id);

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

@@ -43,7 +43,7 @@ public interface TQuestionRepository extends BaseMapper<TQuestion> {
             +"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>")
+            +"<if test=\"business_id != null and business_id != ''\">and business_id = #{business_id}</if></script>")
     List<TQuestion> queryTQuestions(TQuestion tQuestion);
 }
 

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

@@ -20,7 +20,7 @@ import java.util.List;
 @Table(name = "t_question")
 public class TQuestion  extends IdEntity<TQuestion> {
 
-
+     private static final long serialVersionUID = -3700402045439337539L;
 
      private String slId;
 
@@ -39,7 +39,7 @@ public class TQuestion  extends IdEntity<TQuestion> {
 
      @Transient
      private String alias;
-
+     @Transient
      private String desc;
 
 

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

@@ -16,14 +16,14 @@ public interface TQuestionService {
     * @param tQuestion
     * @return
     */
-    PersistModel save(TQuestion tQuestion);
+    PersistModel save(TQuestion tQuestion, String[] questionOptions);
 
     /**
     * 逻辑删除 
-    * @param tQuestion
+    * @param id
     * @return
     */
-     PersistModel remove(TQuestion tQuestion);
+     int remove(String id, String token);
 
     /**
     * 修改 

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

 package org.rcisoft.business.tquestion.service.impl;
 
+import org.apache.commons.collections.MapUtils;
+import org.json.JSONArray;
 import org.rcisoft.business.tquestion.entity.TQuestionOptions;
 import org.rcisoft.core.constant.MessageConstant;
 import org.rcisoft.core.util.UserUtil;
@@ -17,7 +19,11 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -39,9 +45,10 @@ public class TQuestionServiceImpl implements TQuestionService {
     */
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
-    public PersistModel save(TQuestion tQuestion){
+    public PersistModel save(TQuestion tQuestion, String[] questionOptions){
+        List<String> list =  Arrays.asList(questionOptions);
+        Map map = MapUtils.putAll(new HashMap(), questionOptions);
         TQuestionOptions tQuestionOptions = new TQuestionOptions();
-        tQuestion.setCommonBusinessId();
         //增加操作
         UserUtil.setCurrentPersistOperation(tQuestion);
         int line = tQuestionRepository.insertSelective(tQuestion);
@@ -57,17 +64,19 @@ public class TQuestionServiceImpl implements TQuestionService {
 
     /**
     * 逻辑删除
-    * @param tQuestion
+    * @param id
     * @return
     */
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
-    public PersistModel remove(TQuestion tQuestion){
+    public int remove(String id, String token){
+        TQuestion tQuestion = new TQuestion();
+        tQuestion.setBusinessId(id);
         UserUtil.setCurrentMergeOperation(tQuestion);
         int line = tQuestionRepository.logicalDelete(tQuestion);
-        log.info(UserUtil.getUserInfoProp(tQuestion.getToken(),UserUtil.USER_USERNAME)+"逻辑删除了ID为"+
-        tQuestion.getBusinessId()+"的信息");
-        return new PersistModel(line,MessageConstant.MESSAGE_ALERT_SUCCESS);
+        log.info(UserUtil.getUserInfoProp(token,UserUtil.USER_USERNAME)+"逻辑删除了ID为"+
+            tQuestion.getBusinessId()+"的信息");
+        return line;
     }
 
     /**

src/main/resources/mapper/business/tquestion/mapper/TQuestionMapper.xml

@@ -2,21 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.rcisoft.business.tquestion.dao.TQuestionRepository">
     <resultMap id="BaseResultMap" type="org.rcisoft.business.tquestion.entity.TQuestion">
-            <id column="business_id" jdbcType="VARCHAR" property="businessId"/>
-            <result column="sl_id" jdbcType="VARCHAR" property="slId"/>
-            <result column="chap_id" jdbcType="VARCHAR" property="chapId"/>
-            <result column="qtype" jdbcType="VARCHAR" property="qtype"/>
-            <result column="qtitle" jdbcType="VARCHAR" property="qtitle"/>
-            <result column="qdesc" jdbcType="VARCHAR" property="qdesc"/>
-            <result column="qanswer" jdbcType="VARCHAR" property="qanswer"/>
-            <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
-            <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
-            <result column="del_flag" jdbcType="VARCHAR" property="delFlag"/>
-            <result column="flag" jdbcType="VARCHAR" property="flag"/>
-            <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
-            <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
-            <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
+        <id column="business_id" jdbcType="VARCHAR" property="businessId"/>
+        <result column="sl_id" jdbcType="VARCHAR" property="slId"/>
+        <result column="chap_id" jdbcType="VARCHAR" property="chapId"/>
+        <result column="qtype" jdbcType="VARCHAR" property="qtype"/>
+        <result column="qtitle" jdbcType="VARCHAR" property="qtitle"/>
+        <result column="qdesc" jdbcType="VARCHAR" property="qdesc"/>
+        <result column="qanswer" jdbcType="VARCHAR" property="qanswer"/>
+        <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+        <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+        <result column="del_flag" jdbcType="VARCHAR" property="delFlag"/>
+        <result column="flag" jdbcType="VARCHAR" property="flag"/>
+        <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
+        <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+        <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
     </resultMap>
-
-    <!--<cache type="${corePackag!}.util.RedisCache"/>-->
 </mapper>
\ No newline at end of file