Merge branch 'dev0410' of https://git.oschina.net/songyue123456/comm-ques-bank.git into dev0410

Conflicts:
	cqb-comm-utils/pom.xml
	cqb-paper/src/main/java/com/qmth/cqb/paper/service/PaperService.java
	cqb-starter/src/test/java/com/qmth/cqb/AppTest.java

.gitignore

@@ -1,5 +1,19 @@
-.idea
+*.class
+
+# Proguard folder generated by ide
+.project
+.classpath
+.settings
+target/
+.idea/
 *.iml
-out
-gen
-*target
+
+# Log Files
+*.log
+*.class
+
+
+# Package Files #
+*.jar
+*.war
+*.ear

cqb-base/src/main/java/com/qmth/cqb/base/model/Setting.java

@@ -1,69 +1,69 @@
-package com.qmth.cqb.base.model;
-
-import com.qmth.cqb.utils.enums.Switch;
-import org.springframework.data.annotation.Id;
-
-import java.io.Serializable;
-
-/**
- * Created by songyue on 17/3/27.
- */
-public class Setting implements Serializable {
-
-    private static final long serialVersionUID = 8476640757849637183L;
-
-    @Id
-    private String id;
-
-    private String code;
-
-    private String name;
-
-    private Switch status;
-
-    private String params;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Switch getStatus() {
-        return status;
-    }
-
-    public void setStatus(Switch status) {
-        this.status = status;
-    }
-
-    public String getParams() {
-        return params;
-    }
-
-    public void setParams(String params) {
-        this.params = params;
-    }
-}
+package com.qmth.cqb.base.model;
+
+import com.qmth.cqb.utils.enums.Switch;
+import org.springframework.data.annotation.Id;
+
+import java.io.Serializable;
+
+/**
+ * Created by songyue on 17/3/27.
+ */
+public class Setting implements Serializable {
+
+    private static final long serialVersionUID = 8476640757849637183L;
+
+    @Id
+    private String id;
+
+    private String code;
+
+    private String name;
+
+    private Switch status;
+
+    private String params;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Switch getStatus() {
+        return status;
+    }
+
+    public void setStatus(Switch status) {
+        this.status = status;
+    }
+
+    public String getParams() {
+        return params;
+    }
+
+    public void setParams(String params) {
+        this.params = params;
+    }
+}

cqb-base/src/main/java/com/qmth/cqb/base/service/CourseService.java

@@ -1,61 +1,61 @@
-package com.qmth.cqb.base.service;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.stereotype.Service;
-
-import com.qmth.cqb.base.dao.CourseRepo;
-import com.qmth.cqb.base.model.Course;
-/**
- * Created by songyue on 16/12/28.
- */
-@Service
-public class CourseService {
-	
-	@Autowired
-	CourseRepo courseRepo;
-	
-    @Autowired
-    MongoTemplate mongoTemplate;
-    
-    /**
-     * 查询所有课程
-     * @param searchCondition
-     * @param curPage
-     * @param pageSize
-     * @return
-     */
-    public Page<Course> findAll(Course searchCondition, int curPage, int pageSize){
-        return courseRepo.findAll(Example.of(searchCondition),
-                new PageRequest(curPage - 1,pageSize));
-    }
-
-
-    /**
-     * 根据课程名称或者课程No查找课程
-     * @param 
-     * @return
-     */
-    public List<Course> findCoursesByKeyword(String keyword){
-        List<Course> courselist = new ArrayList<Course>();
-        if(StringUtils.isEmpty(keyword)){
-            return courselist;
-        }else{
-            Criteria likeNo = Criteria.where("courseNo").regex(keyword);//模糊匹配相当于SQL中“%Keyword%”
-            Criteria likeName = Criteria.where("courseName").regex(keyword);
-            Query query = new Query(new Criteria().orOperator(likeName,likeNo));
-            courselist = mongoTemplate.find(query, Course.class);
-            return courselist;
-        }
-    }
-}
+package com.qmth.cqb.base.service;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Service;
+
+import com.qmth.cqb.base.dao.CourseRepo;
+import com.qmth.cqb.base.model.Course;
+/**
+ * Created by songyue on 16/12/28.
+ */
+@Service
+public class CourseService {
+	
+	@Autowired
+	CourseRepo courseRepo;
+	
+    @Autowired
+    MongoTemplate mongoTemplate;
+    
+    /**
+     * 查询所有课程
+     * @param searchCondition
+     * @param curPage
+     * @param pageSize
+     * @return
+     */
+    public Page<Course> findAll(Course searchCondition, int curPage, int pageSize){
+        return courseRepo.findAll(Example.of(searchCondition),
+                new PageRequest(curPage - 1,pageSize));
+    }
+
+
+    /**
+     * 根据课程名称或者课程No查找课程
+     * @param 
+     * @return
+     */
+    public List<Course> findCoursesByKeyword(String keyword){
+        List<Course> courselist = new ArrayList<Course>();
+        if(StringUtils.isEmpty(keyword)){
+            return courselist;
+        }else{
+            Criteria likeNo = Criteria.where("courseNo").regex(keyword);//模糊匹配相当于SQL中“%Keyword%”
+            Criteria likeName = Criteria.where("courseName").regex(keyword);
+            Query query = new Query(new Criteria().orOperator(likeName,likeNo));
+            courselist = mongoTemplate.find(query, Course.class);
+            return courselist;
+        }
+    }
+}

cqb-base/src/main/java/com/qmth/cqb/base/service/SettingService.java

@@ -1,45 +1,45 @@
-package com.qmth.cqb.base.service;
-
-
-import com.qmth.cqb.base.dao.CourseRepo;
-import com.qmth.cqb.base.dao.SettingRepo;
-import com.qmth.cqb.base.model.Course;
-import com.qmth.cqb.base.model.Setting;
-import com.qmth.cqb.utils.enums.Switch;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by songyue on 16/12/28.
- */
-@Service
-public class SettingService {
-	
-	@Autowired
-    SettingRepo settingRepo;
-	
-    public void initData(){
-        if(settingRepo.count() == 0){
-            Setting importSetting = new Setting();
-            Setting genSetting = new Setting();
-            importSetting.setCode("import");
-            importSetting.setName("试题入库审核");
-            importSetting.setStatus(Switch.ON);
-            genSetting.setCode("gen");
-            genSetting.setName("试卷组成审核");
-            genSetting.setStatus(Switch.ON);
-            settingRepo.save(importSetting);
-            settingRepo.save(genSetting);
-        }
-    }
-}
+package com.qmth.cqb.base.service;
+
+
+import com.qmth.cqb.base.dao.CourseRepo;
+import com.qmth.cqb.base.dao.SettingRepo;
+import com.qmth.cqb.base.model.Course;
+import com.qmth.cqb.base.model.Setting;
+import com.qmth.cqb.utils.enums.Switch;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by songyue on 16/12/28.
+ */
+@Service
+public class SettingService {
+	
+	@Autowired
+    SettingRepo settingRepo;
+	
+    public void initData(){
+        if(settingRepo.count() == 0){
+            Setting importSetting = new Setting();
+            Setting genSetting = new Setting();
+            importSetting.setCode("import");
+            importSetting.setName("试题入库审核");
+            importSetting.setStatus(Switch.ON);
+            genSetting.setCode("gen");
+            genSetting.setName("试卷组成审核");
+            genSetting.setStatus(Switch.ON);
+            settingRepo.save(importSetting);
+            settingRepo.save(genSetting);
+        }
+    }
+}

cqb-comm-utils/pom.xml

@@ -22,11 +22,13 @@
             <artifactId>common-dto</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
             <groupId>cn.com.qmth.examcloud.common</groupId>
             <artifactId>common-uac</artifactId>
             <version>${project.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -209,4 +211,4 @@
             <version>5.1.1</version>
         </dependency>
     </dependencies>
-</project>
+</project>

cqb-comm-utils/src/main/java/com/qmth/cqb/utils/CombinationUtils.java

@@ -0,0 +1,71 @@
+package com.qmth.cqb.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CombinationUtils {
+
+    private static List<String> combineList = new ArrayList<String>();
+
+    public static List<Integer> combiantion(List<Integer> numbers, int needNum, int needNestNum) {
+        List<Integer> returnList = new ArrayList<Integer>();
+        if (numbers == null || numbers.size() == 0) {
+            return null;
+        }
+        List<Integer> list = new ArrayList<Integer>();
+        for (int i = 1; i <= numbers.size(); i++) {
+            combine(numbers, 0, i, list);
+        }
+        for (String str : combineList) {
+            returnList = sum(str, needNum, needNestNum);
+            if (returnList.size() > 0) {
+                break;
+            }
+        }
+        return returnList;
+    }
+
+    // 从字符数组中第begin个字符开始挑选number个字符加入list中
+    private static void combine(List<Integer> cs, int begin, int number, List<Integer> list) {
+        if (number == 0) {
+            combineList.add(list.toString());
+            return;
+        }
+        if (begin == cs.size()) {
+            return;
+        }
+        list.add(cs.get(begin));
+        combine(cs, begin + 1, number - 1, list);
+        list.remove(cs.get(begin));
+        combine(cs, begin + 1, number, list);
+    }
+
+    public static void main(String args[]) {
+        // List<Integer> list = new ArrayList<Integer>();
+        // list.add(3);
+        // list.add(4);
+        // list.add(5);
+        // combiantion(list);
+        // System.out.println(combineList.toString());
+    }
+
+    private static List<Integer> sum(String str, int needNum, int needNestNum) {
+        List<Integer> list = new ArrayList<Integer>();
+        List<Integer> tempList = new ArrayList<Integer>();
+        String[] strs = str.replaceAll("\\[", "").replaceAll("\\]", "").split(",");
+        Integer sum = 0;
+        if (strs.length == needNestNum) {
+            for (String intStr : strs) {
+                intStr = intStr.trim();
+                sum += Integer.valueOf(intStr);
+                tempList.add(Integer.valueOf(intStr));
+
+            }
+            if (sum <= needNum) {
+                list.addAll(tempList);
+            }
+        }
+
+        return list;
+    }
+}

cqb-gen-paper/pom.xml

@@ -21,5 +21,10 @@
             <artifactId>cqb-paper</artifactId>
             <version>${project.version}</version>
         </dependency>
+         <dependency>
+            <groupId>com.qmth.cqb</groupId>
+            <artifactId>cqb-base</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>

cqb-gen-paper/src/main/java/com/qmth/cqb/genpaper/model/GenPaperDto.java

@@ -34,6 +34,8 @@ public class GenPaperDto implements Serializable {
 
     private Integer genNumber;// 生成试卷套数
 
+    private String orgId;
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -122,4 +124,12 @@ public class GenPaperDto implements Serializable {
         return serialVersionUID;
     }
 
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
 }

cqb-gen-paper/src/main/java/com/qmth/cqb/genpaper/service/GenPaperService.java

@@ -25,6 +25,7 @@ import com.qmth.cqb.paper.model.PaperDetail;
 import com.qmth.cqb.paper.model.PaperDetailUnit;
 import com.qmth.cqb.paper.model.PaperStruct;
 import com.qmth.cqb.question.model.Question;
+import com.qmth.cqb.utils.CombinationUtils;
 import com.qmth.cqb.utils.CommonUtils;
 import com.qmth.cqb.utils.enums.PaperType;
 
@@ -45,6 +46,8 @@ public class GenPaperService {
     @Autowired
     PaperStructRepo paperStructRepo;
 
+    // private List<<>> = new HashMap<String, AtomicInteger>();
+
     /**
      * 精确组卷，根据设定试卷结构组卷
      * 
@@ -111,8 +114,10 @@ public class GenPaperService {
             paper.setCourseNo(genPaperDto.getCourseNo());
             paper.setCourseName(genPaperDto.getCourseName());
             paper.setCreator(genPaperDto.getCreator());
+            paper.setOrgId(genPaperDto.getOrgId());
             paper.setCreateTime(CommonUtils.getCurDateTime());
             paper.setUnitCount(this.getTotalQuesNum(paperDetailunits));
+            paper.setPaperType(PaperType.GENERATE);
             // 数据入库
             paper = this.persistentPaper(paperDetailunits, paperDetails, paper);
             msg = "success";
@@ -170,42 +175,43 @@ public class GenPaperService {
         Map<String, Object> paperMsgMap = new HashMap<String, Object>();
         Map<String, Double> paperMap = genPaperDto.getSimpleParams();
         List<PaperDetailUnit> selectedUnits = new ArrayList<PaperDetailUnit>();// 选中的小题
-        int totalQuesNum = 0;
         if (paperMap != null && paperMap.size() > 0) {
             for (String paperId : paperMap.keySet()) {
-                int unitNum = paperMap.get(paperId).intValue();
-                totalQuesNum += unitNum;
-                List<PaperDetailUnit> tempUnits = new ArrayList<PaperDetailUnit>();
+                int needQuesNum = paperMap.get(paperId).intValue();// 需要抽取的试题数量
                 List<PaperDetailUnit> unitList = unitRepo.findByPaper(paperRepo.findOne(paperId));
                 Collections.shuffle(unitList);// 随机乱序之后再取题
-                if (this.getTotalQuesNum(unitList) >= unitNum) {
-                    for (int i = 0; i < unitList.size(); i++) {// 假如unitNum=2，取了第一道题填空题，第二道题是套题，下面有4个子题，就直接进入下一次循环
-                        PaperDetailUnit unit = unitList.get(i);
-                        int quesNum = this.getTotalQuesNum(tempUnits);
-                        if (unit.getQuestionType() == QuesStructType.NESTED_ANSWER_QUESTION
-                                && (unit.getQuestion().getSubQuestions().size() + quesNum) > unitNum) {
-                            continue;
-                        }
-                        if (quesNum < unitNum && (!tempUnits.contains(unit))) {
-                            tempUnits.add(unit);
-                        }
-                        if (this.getTotalQuesNum(tempUnits) == unitNum) {
-                            break;
-                        }
+                List<PaperDetailUnit> nestedUnits = new ArrayList<PaperDetailUnit>();// 已选的试题集合
+                List<Integer> otherQuesNum = new ArrayList<Integer>();
+                List<Integer> nestQums = new ArrayList<Integer>();
+                if (this.getTotalQuesNum(unitList) >= needQuesNum) {
+                    for (int i = 0; i < unitList.size(); i++) {
+                        PaperDetailUnit pdu = unitList.get(i);
+                        if (pdu.getQuestionType() == QuesStructType.NESTED_ANSWER_QUESTION) {
+                            if (pdu.getQuestion().getSubQuestions().size() <= needQuesNum) {
+                                nestQums.add(pdu.getQuestion().getSubQuestions().size());
+                                nestedUnits.add(pdu);
+                            }
 
+                        } else {
+                            otherQuesNum.add(1);
+                        }
+                    }
+                    List<Integer> canChooseNestNum = this.getNestNum(nestQums, otherQuesNum.size(), needQuesNum);
+                    Collections.shuffle(canChooseNestNum);// 随机乱序
+                    int ranmdomNum = canChooseNestNum.get(0);// 取第一个
+                    if (ranmdomNum == 0) {// 假如随机到0个套题
+                        selectedUnits = this.getNeedUnits(null, unitList, needQuesNum);
+                    } else {
+                        List<Integer> sumList = new ArrayList<Integer>();
+                        sumList = CombinationUtils.combiantion(nestQums, needQuesNum, ranmdomNum);
+                        selectedUnits = this.getNeedUnits(sumList, unitList, needQuesNum);// 有套题情况
                     }
-                    selectedUnits.addAll(tempUnits);
                 } else {
-                    msg = "题源不足:需要抽取的题目数量要多于试卷中题目数量，请检查";
+                    msg = "题源不足，请检查题源";
                     paperMsgMap.put("msg", msg);
                     return paperMsgMap;
                 }
             }
-            if (this.getTotalQuesNum(selectedUnits) < totalQuesNum) {
-                msg = "题源不足:需要抽取的题目数量要多于试卷中题目数量，请检查";
-                paperMsgMap.put("msg", msg);
-                return paperMsgMap;
-            }
         }
         Paper paper = this.constuctPaper(selectedUnits, genPaperDto);
         msg = "success";
@@ -269,6 +275,7 @@ public class GenPaperService {
             paper.setPaperDetailCount(details.size());
             paper.setTotalScore(score);
             paper.setPaperType(PaperType.GENERATE);
+            paper.setOrgId(genPaperDto.getOrgId());
         }
         return paper;
 
@@ -353,4 +360,56 @@ public class GenPaperService {
         return totalQuesNum + nestQuesNum;
     }
 
+    public List<PaperDetailUnit> getNeedUnits(List<Integer> sumList, List<PaperDetailUnit> unitList, int needQuesNum) {
+        List<PaperDetailUnit> selectedUnits = new ArrayList<PaperDetailUnit>();// 选中的小题
+        List<PaperDetailUnit> nestedUnits = new ArrayList<PaperDetailUnit>();// 套题集合
+        List<PaperDetailUnit> otherUnits = new ArrayList<PaperDetailUnit>();// 其他类型的小题
+        for (PaperDetailUnit pdu : unitList) {
+            if (pdu.getQuestionType() == QuesStructType.NESTED_ANSWER_QUESTION) {
+                nestedUnits.add(pdu);
+            } else {
+                otherUnits.add(pdu);
+            }
+        }
+        // 选的套题
+        if (sumList != null && sumList.size() > 0) {
+            for (Integer subNum : sumList) {
+                for (PaperDetailUnit pdu : nestedUnits) {
+                    if (subNum == pdu.getQuestion().getSubQuestions().size()) {
+                        selectedUnits.add(pdu);
+                        break;
+                    }
+                }
+            }
+        }
+        int otherQuesNum = needQuesNum - this.getTotalQuesNum(selectedUnits);
+        for (int i = 0; i < otherQuesNum; i++) {
+            selectedUnits.add(otherUnits.get(i));
+        }
+        return selectedUnits;
+    }
+
+    public List<Integer> getNestNum(List<Integer> nestQums, int otherQuesNum, int needQuesNum) {
+        Collections.sort(nestQums);
+        List<Integer> chooseNestNum = new ArrayList<Integer>();
+        if (needQuesNum <= otherQuesNum) {
+            chooseNestNum.add(0);
+        }
+        for (int i = 1; i <= nestQums.size(); i++) {
+            int min = 0;
+            int max = 0;
+            for (int j = 0; j < i; j++) {
+                min += nestQums.get(j);
+                max += nestQums.get(nestQums.size() - 1 - j);
+            }
+            if ((max + otherQuesNum >= needQuesNum && needQuesNum - max <= otherQuesNum && needQuesNum - max >= 0)
+                    || (min + otherQuesNum >= needQuesNum && needQuesNum - min <= otherQuesNum
+                            && needQuesNum - min >= 0)) {
+                chooseNestNum.add(i);
+            }
+        }
+
+        return chooseNestNum;
+
+    }
 }

cqb-gen-paper/src/main/java/com/qmth/cqb/genpaper/web/GenPaperController.java

@@ -3,6 +3,8 @@ package com.qmth.cqb.genpaper.web;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -13,7 +15,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.qmth.cqb.genpaper.model.GenPaperDto;
 import com.qmth.cqb.genpaper.service.GenPaperService;
+import com.qmth.cqb.utils.enums.RandomGenPaperPolicy;
 
+import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 import io.swagger.annotations.ApiOperation;
 
 /**
@@ -28,7 +32,10 @@ public class GenPaperController {
 
     @ApiOperation(value = "简易随机组卷", notes = "简易随机组卷")
     @PostMapping("/genPaper/simple")
-    public ResponseEntity genPaperSimple(@RequestBody GenPaperDto genPaperDto) {
+    public ResponseEntity genPaperSimple(HttpServletRequest request, @RequestBody GenPaperDto genPaperDto) {
+        AccessUser user = (AccessUser) request.getAttribute("accessUser");
+        genPaperDto.setOrgId(user.getOrgId().toString());
+        genPaperDto.setCreator(user.getLoginName());
         Map<String, Object> paperMap = new HashMap<String, Object>();
         String paperName = genPaperDto.getPaperName();
         if (genPaperDto.getGenNumber() == 1) {
@@ -38,17 +45,22 @@ public class GenPaperController {
                 paperMap = genPaperService.genPaperByScore(genPaperDto);
             }
         } else if (genPaperDto.getGenNumber() > 1) {
-            if (genPaperDto.getSimpleGenPaperPolicy().getKey() == 1L) {
+            if (genPaperDto.getSimpleGenPaperPolicy() == RandomGenPaperPolicy.BY_QUESTIONNUM) {
                 for (int i = 1; i <= genPaperDto.getGenNumber(); i++) {
                     genPaperDto.setPaperName(paperName + "_" + i);
                     paperMap.putAll(genPaperService.genPaperByQuestionNum(genPaperDto));
+                    if (!paperMap.get("msg").equals("success")) {
+                        break;
+                    }
                 }
 
-            } else if (genPaperDto.getSimpleGenPaperPolicy().getKey() == 2L) {
+            } else if (genPaperDto.getSimpleGenPaperPolicy() == RandomGenPaperPolicy.BY_SCORE) {
                 for (int i = 1; i <= genPaperDto.getGenNumber(); i++) {
                     genPaperDto.setPaperName(genPaperDto.getPaperName() + "_" + i);
                     paperMap.putAll(genPaperService.genPaperByScore(genPaperDto));
-                    genPaperDto.setPaperName("");
+                    if (!paperMap.get("msg").equals("success")) {
+                        break;
+                    }
                 }
 
             }
@@ -64,13 +76,19 @@ public class GenPaperController {
 
     @ApiOperation(value = "精细组卷", notes = "精细组卷")
     @PostMapping("/genPaper/normal")
-    public ResponseEntity genPaperNormal(@RequestBody GenPaperDto genPaperDto) {
+    public ResponseEntity genPaperNormal(HttpServletRequest request, @RequestBody GenPaperDto genPaperDto) {
+        AccessUser user = (AccessUser) request.getAttribute("accessUser");
+        genPaperDto.setOrgId(user.getOrgId().toString());
+        genPaperDto.setCreator(user.getLoginName());
         Map<String, Object> paperMap = new HashMap<String, Object>();
         String paperName = genPaperDto.getPaperName();
         if (genPaperDto.getGenNumber() > 1) {
             for (int i = 1; i <= genPaperDto.getGenNumber(); i++) {
                 genPaperDto.setPaperName(paperName + "_" + i);
                 paperMap.putAll(genPaperService.genPaper(genPaperDto));
+                if (!paperMap.get("msg").equals("success")) {
+                    break;
+                }
             }
         } else if (genPaperDto.getGenNumber() == 1) {
             paperMap = genPaperService.genPaper(genPaperDto);

cqb-paper/src/main/java/com/qmth/cqb/paper/model/Paper.java

@@ -3,53 +3,56 @@ package com.qmth.cqb.paper.model;
 import java.io.Serializable;
 import java.util.Map;
 
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.index.Indexed;
+
 import com.qmth.cqb.utils.CommonUtils;
 import com.qmth.cqb.utils.enums.PaperStatus;
 import com.qmth.cqb.utils.enums.PaperType;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.index.Indexed;
 
 /**
  * @author songyue
  *
  */
-public class Paper implements Serializable { 
-	
-	private static final long serialVersionUID = 5259364047220441490L;
+public class Paper implements Serializable {
+
+    private static final long serialVersionUID = 5259364047220441490L;
 
-	@Id
+    @Id
     private String id;
 
     @Indexed(unique = true)
-    private String name;//试卷名称
-    
-    private String title;//试卷标题
-    
-    private Double totalScore;//试卷总分
-    
-    private String creator;//创建人id
+    private String name;// 试卷名称
+
+    private String title;// 试卷标题
+
+    private Double totalScore;// 试卷总分
 
-    private Integer paperDetailCount;//大题数量
+    private String creator;// 创建人id
 
-    private Integer unitCount;//小题数量
+    private Integer paperDetailCount;// 大题数量
 
-    private String createTime;//创建时间
+    private Integer unitCount;// 小题数量
 
-    private String lastModifyName;//最后修改人名称
+    private String createTime;// 创建时间
 
-    private String word;//原始试卷word
+    private String lastModifyName;// 最后修改人名称
 
-    private String html;//原始试卷html
+    private String word;// 原始试卷word
 
-    private PaperStatus paperStatus;//试卷状态(待审核、通过、不通过)
+    private String html;// 原始试卷html
 
-    private PaperType paperType;//试卷类型(导入、组卷)
+    private PaperStatus paperStatus;// 试卷状态(待审核、通过、不通过)
+
+    private PaperType paperType;// 试卷类型(导入、组卷)
 
     private String courseNo;
 
     private String courseName;
 
-    private Map<String,String> params;//导入试卷属性
+    private String orgId;
+
+    private Map<String, String> params;// 导入试卷属性
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -183,9 +186,16 @@ public class Paper implements Serializable {
         this.unitCount = unitCount;
     }
 
-    public Paper() {
-		this.createTime = CommonUtils.getCurDateTime();
+    public String getOrgId() {
+        return orgId;
     }
 
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    public Paper() {
+        this.createTime = CommonUtils.getCurDateTime();
+    }
 
 }

cqb-paper/src/main/java/com/qmth/cqb/paper/model/PaperSearchInfo.java

@@ -1,63 +1,85 @@
 package com.qmth.cqb.paper.model;
 
 import java.io.Serializable;
-import java.util.Map;
 
-public class PaperSearchInfo implements Serializable{
+import com.qmth.cqb.utils.enums.PaperStatus;
 
-	private static final long serialVersionUID = 8273918442524569201L;
+public class PaperSearchInfo implements Serializable {
 
-    private String name;//试卷名称
+    private static final long serialVersionUID = 8273918442524569201L;
 
-    private String createTime;//创建时间
+    private String name;// 试卷名称
 
-    private String creator;//录入员
-    
-    private String courseNo;//课程代码
+    private String createTime;// 创建时间
 
-	private String [] paperIds;
+    private String creator;// 录入员
 
-	public static long getSerialVersionUID() {
-		return serialVersionUID;
-	}
+    private String courseNo;// 课程代码
 
-	public String getName() {
-		return name;
-	}
+    private String orgId;// 机构Id
 
-	public void setName(String name) {
-		this.name = name;
-	}
+    private PaperStatus paperStatus; // 试卷审核状态
 
-	public String getCreateTime() {
-		return createTime;
-	}
+    private String[] paperIds;
 
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
 
-	public String getCreator() {
-		return creator;
-	}
+    public String getName() {
+        return name;
+    }
 
-	public void setCreator(String creator) {
-		this.creator = creator;
-	}
+    public void setName(String name) {
+        this.name = name;
+    }
 
-	public String getCourseNo() {
-		return courseNo;
-	}
+    public String getCreateTime() {
+        return createTime;
+    }
 
-	public void setCourseNo(String courseNo) {
-		this.courseNo = courseNo;
-	}
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
 
-	public String[] getPaperIds() {
-		return paperIds;
-	}
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getCourseNo() {
+        return courseNo;
+    }
+
+    public void setCourseNo(String courseNo) {
+        this.courseNo = courseNo;
+    }
+
+    public String[] getPaperIds() {
+        return paperIds;
+    }
+
+    public void setPaperIds(String[] paperIds) {
+        this.paperIds = paperIds;
+    }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    public PaperStatus getPaperStatus() {
+        return paperStatus;
+    }
+
+    public void setPaperStatus(PaperStatus paperStatus) {
+        this.paperStatus = paperStatus;
+    }
 
-	public void setPaperIds(String[] paperIds) {
-		this.paperIds = paperIds;
-	}
 }

cqb-paper/src/main/java/com/qmth/cqb/paper/model/PaperStruct.java

@@ -1,109 +1,120 @@
 package com.qmth.cqb.paper.model;
 
 import java.io.Serializable;
-import java.util.Map;
 import java.util.List;
+import java.util.Map;
 
-import com.qmth.cqb.utils.CommonUtils;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.index.Indexed;
 
+import com.qmth.cqb.utils.CommonUtils;
+
 /**
- * 试卷结构
- * Created by songyue on 16/12/28.
+ * 试卷结构 Created by songyue on 16/12/28.
  */
 
-public class PaperStruct implements Serializable{
+public class PaperStruct implements Serializable {
 
-	private static final long serialVersionUID = 6380530617488717881L;
+    private static final long serialVersionUID = 6380530617488717881L;
 
-	@Id
+    @Id
     private String id;
 
     @Indexed(unique = true)
-    private String name;//试卷结构名称
-        
-    private Double totalScore;//总分
-    
-    private Integer detailCount;//大题数量
-    
+    private String name;// 试卷结构名称
+
+    private Double totalScore;// 总分
+
+    private Integer detailCount;// 大题数量
+
     private Map params;
 
-	private List<PaperDetailStruct> paperDetailStructs;//大题
+    private List<PaperDetailStruct> paperDetailStructs;// 大题
+
+    private String creator;// 创建人id
+
+    private String createTime;// 创建时间
+
+    private String orgId;// 机构ID
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
 
-	private String creator;//创建人id
+    public String getId() {
+        return id;
+    }
 
-	private String createTime;//创建时间
+    public void setId(String id) {
+        this.id = id;
+    }
 
-	public static long getSerialVersionUID() {
-		return serialVersionUID;
-	}
+    public String getName() {
+        return name;
+    }
 
-	public String getId() {
-		return id;
-	}
+    public void setName(String name) {
+        this.name = name;
+    }
 
-	public void setId(String id) {
-		this.id = id;
-	}
+    public Double getTotalScore() {
+        return totalScore;
+    }
 
-	public String getName() {
-		return name;
-	}
+    public void setTotalScore(Double totalScore) {
+        this.totalScore = totalScore;
+    }
 
-	public void setName(String name) {
-		this.name = name;
-	}
+    public Integer getDetailCount() {
+        return detailCount;
+    }
 
-	public Double getTotalScore() {
-		return totalScore;
-	}
+    public void setDetailCount(Integer detailCount) {
+        this.detailCount = detailCount;
+    }
 
-	public void setTotalScore(Double totalScore) {
-		this.totalScore = totalScore;
-	}
+    public Map getParams() {
+        return params;
+    }
 
-	public Integer getDetailCount() {
-		return detailCount;
-	}
+    public void setParams(Map params) {
+        this.params = params;
+    }
 
-	public void setDetailCount(Integer detailCount) {
-		this.detailCount = detailCount;
-	}
+    public List<PaperDetailStruct> getPaperDetailStructs() {
+        return paperDetailStructs;
+    }
 
-	public Map getParams() {
-		return params;
-	}
+    public void setPaperDetailStructs(List<PaperDetailStruct> paperDetailStructs) {
+        this.paperDetailStructs = paperDetailStructs;
+    }
 
-	public void setParams(Map params) {
-		this.params = params;
-	}
+    public String getCreator() {
+        return creator;
+    }
 
-	public List<PaperDetailStruct> getPaperDetailStructs() {
-		return paperDetailStructs;
-	}
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
 
-	public void setPaperDetailStructs(List<PaperDetailStruct> paperDetailStructs) {
-		this.paperDetailStructs = paperDetailStructs;
-	}
+    public String getCreateTime() {
+        return createTime;
+    }
 
-	public String getCreator() {
-		return creator;
-	}
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
 
-	public void setCreator(String creator) {
-		this.creator = creator;
-	}
+    public PaperStruct() {
+        this.createTime = CommonUtils.getCurDateTime();
+    }
 
-	public String getCreateTime() {
-		return createTime;
-	}
+    public String getOrgId() {
+        return orgId;
+    }
 
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
 
-	public PaperStruct() {
-		this.createTime = CommonUtils.getCurDateTime();
-	}
 }

cqb-paper/src/main/java/com/qmth/cqb/paper/model/PaperStructSearchInfo.java

@@ -5,7 +5,7 @@ import java.io.Serializable;
 /**
  * Created by songyue on 17/3/27.
  */
-public class PaperStructSearchInfo implements Serializable{
+public class PaperStructSearchInfo implements Serializable {
 
     private static final long serialVersionUID = 5282899855557734214L;
 
@@ -15,6 +15,8 @@ public class PaperStructSearchInfo implements Serializable{
 
     private String createtime;
 
+    private String orgId;
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -42,4 +44,13 @@ public class PaperStructSearchInfo implements Serializable{
     public void setCreatetime(String createtime) {
         this.createtime = createtime;
     }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
 }

cqb-paper/src/main/java/com/qmth/cqb/paper/service/ImportPaperService.java

@@ -1,8 +1,26 @@
 package com.qmth.cqb.paper.service;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.docx4j.wml.P;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
 import com.google.gson.Gson;
-import com.qmth.cqb.base.dao.CourseRepo;
 import com.qmth.cqb.paper.dao.PaperDetailRepo;
 import com.qmth.cqb.paper.dao.PaperDetailUnitRepo;
 import com.qmth.cqb.paper.dao.PaperRepo;
@@ -19,25 +37,15 @@ import com.qmth.cqb.utils.enums.PaperStatus;
 import com.qmth.cqb.utils.enums.PaperType;
 import com.qmth.cqb.utils.enums.QuesUnit;
 import com.qmth.cqb.utils.word.DocxProcessUtil;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.docx4j.wml.P;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 
 @Service
 public class ImportPaperService {
 
+    protected static final Logger log = LoggerFactory.getLogger(ImportPaperService.class);
+
     @Autowired
     PaperRepo paperRepo;
 
@@ -59,9 +67,6 @@ public class ImportPaperService {
     @Autowired
     PaperService paperService;
 
-    @Autowired
-    CourseRepo courseRepo;
-
     /**
      * 获取上传文件
      *
@@ -77,6 +82,7 @@ public class ImportPaperService {
             IOUtils.copyLarge(file.getInputStream(), os);
         } catch (Exception e) {
             e.printStackTrace();
+            log.error("上传文件异常:" + e.getMessage());
         } finally {
             IOUtils.closeQuietly(os);
         }
@@ -91,20 +97,20 @@ public class ImportPaperService {
      * @param file
      * @return
      */
-    public String ImportPaper(String paperName, String courseNo, File file) {
-        String errorInfo = paperService.checkPaperName(paperName);
+    public String ImportPaper(String paperName, String courseNo, String courseName, AccessUser user, File file) {
+        String errorInfo = paperService.checkPaperName(paperName, user.getOrgId().toString());
         if (errorInfo == null) {
             errorInfo = "";
-            errorInfo += processImportPaper(paperName, courseNo, file);
+            errorInfo += processImportPaper(paperName, courseNo, courseName, user, file);
             if (StringUtils.isEmpty(errorInfo)) {
                 return "success";
             } else {
+                log.error("导入异常:" + errorInfo);
                 return errorInfo;
             }
         } else {
             return errorInfo;
         }
-
     }
 
     /**
@@ -147,7 +153,7 @@ public class ImportPaperService {
      *
      * @param file
      */
-    public String processImportPaper(String paperName, String courseNo, File file) {
+    public String processImportPaper(String paperName, String courseNo, String courseName, AccessUser user, File file) {
 
         WordprocessingMLPackage wordMLPackage;
         WordprocessingMLPackage tmpWordMlPackage;
@@ -170,7 +176,11 @@ public class ImportPaperService {
 
             paper.setCourseNo(courseNo);
 
-            paper.setCourseName(courseRepo.findByCourseNo(courseNo).getCourseName());
+            paper.setCourseName(courseName);
+
+            paper.setOrgId(user.getOrgId().toString());
+
+            paper.setCreator(user.getLoginName());
 
             // 设置试卷
             initPaper(paper, paperName);
@@ -214,8 +224,8 @@ public class ImportPaperService {
                     // 设置大题类
                     initQuesHeader(paper, paperDetail, paperDetails, ++mainQuesNum, importPaperCheck);
 
-                } else if (pText.matches("^\\d{1,}\\.[\\s\\S]*") || (isNested(importPaperCheck) && !pText
-                        .startsWith("["))) {
+                } else if (pText.matches("^\\d{1,}\\.[\\s\\S]*")
+                        || (isNested(importPaperCheck) && !pText.startsWith("["))) {
                     // 处理试题
 
                     // 创建小题类和试题类
@@ -251,11 +261,10 @@ public class ImportPaperService {
                     }
                     // 设置WordMlPackage二进制数据
                     setPkgByte(question, writePkg);
-                    //Map<String, String> quesParams = new HashMap<String, String>();
-                    //quesParams.put("courseName", paper.getCourseName());
                     // 设置question与Unit集合数据
                     question.setCourseNo(paper.getCourseNo());
                     question.setCourseName(paper.getCourseName());
+                    question.setOrgId(user.getOrgId().toString());
                     questions.add(question);
                     paperDetailUnits.add(paperDetailUnit);
 
@@ -273,6 +282,7 @@ public class ImportPaperService {
         } catch (Exception e) {
             e.printStackTrace();
             importPaperCheck.setErrorInfo(e.getMessage());
+            log.error("导入处理异常:" + e.getMessage());
         } finally {
             wordMLPackage = null;
             tmpWordMlPackage = null;
@@ -308,18 +318,11 @@ public class ImportPaperService {
             ImportPaperCheck importPaperCheck) {
 
         paperDetail.setPaper(paper);
-
-        // 不从word中提取课程信息，统一从页面设置好
-        // if (StringUtils.isEmpty(paper.getCourseNo()) ||
-        // StringUtils.isEmpty(paper.getCourseName())) {
-        // paper.setCourseNo(getCourseNo(importPaperCheck));
-        // paper.setCourseName(getCourseName(importPaperCheck));
-        // }
         // 设置大题信息
         paperDetail.setName(importPaperCheck.quesName);
         paperDetail.setUnitCount(Integer.parseInt(importPaperCheck.quesCount));
         paperDetail.setNumber(mainQuesNum);
-
+        paperDetail.setCreator(paper.getCreator());
         paperDetails.add(paperDetail);
 
     }
@@ -343,6 +346,7 @@ public class ImportPaperService {
         paperDetailUnit.setPaperDetail(paperDetail);
         paperDetailUnit.setQuestionType(getQuesStructType(importPaperCheck.quesType));
         paperDetailUnit.setScore(Double.parseDouble(importPaperCheck.quesScore));
+        paperDetailUnit.setCreator(paper.getCreator());
         paperDetailUnit.setPaper(paper);
     }
 
@@ -813,23 +817,30 @@ public class ImportPaperService {
      * @param paperName
      * @return
      */
-    public String saveBlankPaper(String courseNo, String paperName) {
+    public Map<String, Object> saveBlankPaper(String courseNo, String courseName, String paperName, AccessUser user) {
+        Map<String, Object> returnMap = new HashMap<String, Object>();
         Paper paper = new Paper();
-        String courseName = courseRepo.findByCourseNo(courseNo).getCourseName();
-        String msg = paperService.checkPaperName(paperName);
+        String msg = paperService.checkPaperName(paperName, user.getOrgId().toString());
         if (msg != null) {
-            return msg;
+            returnMap.put("msg", msg);
+            return returnMap;
         }
         initPaper(paper, paperName);
         paper.setCourseNo(courseNo);
         paper.setCourseName(courseName);
+        paper.setOrgId(user.getOrgId().toString());
+        paper.setCreator(user.getLoginName());
+        paper.setCreateTime(CommonUtils.getCurDateTime());
         PaperDetail pd = new PaperDetail();
         pd.setId(UUID.randomUUID().toString());
         pd.setNumber(1);
         pd.setPaper(paper);
-        paperRepo.save(paper);
+        pd.setCreator(user.getLoginName());
+        pd.setCreateTime(CommonUtils.getCurDateTime());
+        paper = paperRepo.save(paper);
         paperDetailRepo.save(pd);
-        msg = "success";
-        return msg;
+        returnMap.put("paper", paper);
+        returnMap.put("msg", "success");
+        return returnMap;
     }
 }

cqb-paper/src/main/java/com/qmth/cqb/paper/service/PaperService.java

@@ -39,6 +39,7 @@ import com.qmth.cqb.utils.enums.PaperStatus;
 import com.qmth.cqb.utils.enums.PaperType;
 
 import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 
 /**
  * Created by songyue on 16/12/28.
@@ -135,8 +136,7 @@ public class PaperService {
         Example<ExamPaper> example = Example.of(examPaper);
         List<ExamPaper> examPapers = examPaperRepo.findAll(example);
         for (ExamPaper ePaper : examPapers) {
-            //Paper paper = paperRepo.findOne(ePaper.getPaperId());
-        	Paper paper = ePaper.getPaper();
+            Paper paper = paperRepo.findOne(ePaper.getPaper().getId());
             papers.add(paper);
         }
         return papers;
@@ -156,9 +156,7 @@ public class PaperService {
         examPaper.setExamId(examId);
         examPaper.setGroupCode(groupCode);
         examPaper.setCourseCode(courseCode);
-        Paper paper = paperRepo.findOne(paperId);
-       // examPaper.setPaperId(paperId);
-        examPaper.setPaper(paper);
+//        examPaper.setPaperId(paperId);
         examPaperRepo.save(examPaper);
     }
 
@@ -167,9 +165,7 @@ public class PaperService {
         examPaper.setExamId(examId);
         examPaper.setGroupCode(groupCode);
         examPaper.setCourseCode(courseCode);
-        Paper paper = paperRepo.findOne(paperId);
-        // examPaper.setPaperId(paperId);
-         examPaper.setPaper(paper);
+//        examPaper.setPaperId(paperId);
         examPaperRepo.delete(examPaper);
     }
 
@@ -448,7 +444,8 @@ public class PaperService {
      * @param paperDetailId
      * @return
      */
-    public Paper insertQuestionToPaper(String paperId, String paperDetailId, Question question) {
+    public Paper insertQuestionToPaper(String paperId, String paperDetailId, Question question, AccessUser user) {
+        question.setOrgId(user.getOrgId().toString());
         quesService.updateQuesWord(question);
         question = quesRepo.save(question);
         Paper paper = paperRepo.findOne(paperId);
@@ -537,9 +534,12 @@ public class PaperService {
         return paper;
     }
 
-    public String checkPaperName(String paperName) {
+    public String checkPaperName(String paperName, String orgId) {
         String msg = null;
-        Paper paper = paperRepo.findByName(paperName);
+        Paper paperTemp = new Paper();
+        paperTemp.setName(paperName);
+        paperTemp.setOrgId(orgId);
+        Paper paper = paperRepo.findOne(Example.of(paperTemp));
         if (paper != null) {
             msg = "试卷名称重复，请重新命名";
         }

cqb-paper/src/main/java/com/qmth/cqb/paper/service/PaperStructService.java

@@ -1,9 +1,8 @@
 package com.qmth.cqb.paper.service;
 
+import java.util.ArrayList;
+import java.util.List;
 
-import com.qmth.cqb.paper.dto.PaperDetailUnitStructDto;
-import com.qmth.cqb.paper.model.*;
-import com.qmth.cqb.utils.BeanCopierUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
@@ -13,70 +12,74 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
 import com.qmth.cqb.paper.dao.PaperStructRepo;
+import com.qmth.cqb.paper.dto.PaperDetailUnitStructDto;
+import com.qmth.cqb.paper.model.PaperDetailStruct;
+import com.qmth.cqb.paper.model.PaperDetailUnitStruct;
+import com.qmth.cqb.paper.model.PaperStruct;
+import com.qmth.cqb.paper.model.PaperStructSearchInfo;
+import com.qmth.cqb.utils.BeanCopierUtil;
+import com.qmth.cqb.utils.CommonUtils;
+
+import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 
-import java.util.ArrayList;
-import java.util.List;
 /**
  * Created by songyue on 16/12/28.
  */
 @Service
 public class PaperStructService {
-	
-	@Autowired
-    PaperStructRepo paperStructRepo;
 
+    @Autowired
+    PaperStructRepo paperStructRepo;
 
     /**
      * 获取所有试卷结构
+     * 
      * @param searchInfo
      * @param curPage
      * @param pageSize
      * @return
      */
-    public Page<PaperStruct> getPaperStructs(PaperStructSearchInfo searchInfo,
-                                             int curPage,
-                                             int pageSize){
+    public Page<PaperStruct> getPaperStructs(PaperStructSearchInfo searchInfo, int curPage, int pageSize,AccessUser user) {
+        searchInfo.setOrgId(user.getOrgId().toString());
         formatSearchInfo(searchInfo);
-        PaperStruct paperStruct = BeanCopierUtil.copyProperties(searchInfo,PaperStruct.class);
+        PaperStruct paperStruct = BeanCopierUtil.copyProperties(searchInfo, PaperStruct.class);
         formatPaperStruct(paperStruct);
-        ExampleMatcher matcher = ExampleMatcher.matching().
-                withStringMatcher(ExampleMatcher.StringMatcher.CONTAINING).withIgnoreNullValues();
-        return paperStructRepo.findAll(Example.of(paperStruct,matcher),
-                new PageRequest(curPage - 1,pageSize));
+        ExampleMatcher matcher = ExampleMatcher.matching().withStringMatcher(ExampleMatcher.StringMatcher.CONTAINING)
+                .withIgnoreNullValues();
+        return paperStructRepo.findAll(Example.of(paperStruct, matcher), new PageRequest(curPage - 1, pageSize));
     }
 
-    public void formatSearchInfo(PaperStructSearchInfo searchInfo){
-        if(StringUtils.isEmpty(searchInfo.getName())){
+    public void formatSearchInfo(PaperStructSearchInfo searchInfo) {
+        if (StringUtils.isEmpty(searchInfo.getName())) {
             searchInfo.setName(null);
         }
-        if(StringUtils.isEmpty(searchInfo.getCreator())){
+        if (StringUtils.isEmpty(searchInfo.getCreator())) {
             searchInfo.setCreator(null);
         }
     }
 
-    public void formatPaperStruct(PaperStruct paperStruct){
+    public void formatPaperStruct(PaperStruct paperStruct) {
         paperStruct.setCreateTime(null);
     }
 
     /**
      * 保存试卷结构
+     * 
      * @param paperStruct
      * @return
      */
-    public PaperStruct save(PaperStruct paperStruct){
-
+    public PaperStruct save(PaperStruct paperStruct, AccessUser user) {
         List<PaperDetailStruct> paperDetailStructs = paperStruct.getPaperDetailStructs();
         int number = 0;
-
-        for(PaperDetailStruct paperDetailStruct:paperDetailStructs){
+        for (PaperDetailStruct paperDetailStruct : paperDetailStructs) {
             List oldStructs = paperDetailStruct.getPaperDetailUnitStructs();
-            if(oldStructs != null && oldStructs.size() > 0){
+            if (oldStructs != null && oldStructs.size() > 0) {
                 oldStructs.clear();
             }
             List<PaperDetailUnitStruct> unitStructs = new ArrayList<PaperDetailUnitStruct>();
 
-            for(PaperDetailUnitStructDto unitStructDto:paperDetailStruct.getUnitStructs()){
-                for(int i = 0;i < unitStructDto.getCount();i++){
+            for (PaperDetailUnitStructDto unitStructDto : paperDetailStruct.getUnitStructs()) {
+                for (int i = 0; i < unitStructDto.getCount(); i++) {
                     ++number;
                     PaperDetailUnitStruct unitStruct = new PaperDetailUnitStruct();
                     unitStruct.setScore(unitStructDto.getScore());
@@ -89,8 +92,10 @@ public class PaperStructService {
             paperDetailStruct.setPaperDetailUnitStructs(unitStructs);
         }
         paperStruct.setDetailCount(paperDetailStructs.size());
+        paperStruct.setOrgId(user.getOrgId().toString());
+        paperStruct.setCreator(user.getLoginName());
+        paperStruct.setCreateTime(CommonUtils.getCurDateTime());
         return paperStructRepo.save(paperStruct);
     }
 
-
 }

cqb-paper/src/main/java/com/qmth/cqb/paper/web/ImportPaperController.java

@@ -4,6 +4,10 @@ import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -18,6 +22,7 @@ import com.qmth.cqb.paper.dao.PaperRepo;
 import com.qmth.cqb.paper.service.ImportPaperService;
 import com.qmth.cqb.paper.service.PaperService;
 
+import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 import io.swagger.annotations.ApiOperation;
 
 /**
@@ -27,6 +32,8 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping("${api_cqb}/")
 public class ImportPaperController {
 
+    protected static final Logger log = LoggerFactory.getLogger(ImportPaperController.class);
+
     @Autowired
     ImportPaperService importPaperService;
 
@@ -45,10 +52,14 @@ public class ImportPaperController {
      */
     @ApiOperation(value = "导入试卷", notes = "导入试卷")
     @PostMapping(value = "/importPaper")
-    public ResponseEntity importPaper(@RequestParam String paperName, @RequestParam String courseNo,
+    public ResponseEntity importPaper(HttpServletRequest request, @RequestParam String paperName,
+            @RequestParam String courseNo, @RequestParam String courseName,
             @RequestParam("file") CommonsMultipartFile file) {
+        AccessUser user = (AccessUser) request.getAttribute("accessUser");
+        log.info("导入开始");
         File tempFile = importPaperService.getUploadFile(file);
-        String returnStr = importPaperService.ImportPaper(paperName, courseNo, tempFile);
+        String returnStr = importPaperService.ImportPaper(paperName, courseNo, courseName, user, tempFile);
+        log.info("导入结束");
         if (returnStr.equals("success")) {
             return new ResponseEntity(returnStr, HttpStatus.OK);
         } else {
@@ -56,23 +67,25 @@ public class ImportPaperController {
             map.put("errorMsg", returnStr);
             return new ResponseEntity(map, HttpStatus.INTERNAL_SERVER_ERROR);
         }
-        // return returnStr;
     }
 
     /**
-     * 新增一张空白试卷
+     * 新增试卷
      * 
-     * @param paper
+     * @param courseNo
+     * @param paperName
      * @return
      */
     @ApiOperation(value = "保存导入类型空白试卷", notes = "保存导入类型空白试卷")
-    @PostMapping(value = "/importPaper/saveBlankPaper/{courseNo}/{paperName}")
-    public ResponseEntity saveBlankPaper(@PathVariable String courseNo, @PathVariable String paperName) {
-        String msg = importPaperService.saveBlankPaper(courseNo, paperName);
-        if (msg.equals("success")) {
-            return new ResponseEntity(msg, HttpStatus.OK);
+    @PostMapping(value = "/importPaper/saveBlankPaper/{courseNo}/{courseName}/{paperName}")
+    public ResponseEntity saveBlankPaper(HttpServletRequest request, @PathVariable String courseNo,
+            @PathVariable String courseName, @PathVariable String paperName) {
+        AccessUser user = (AccessUser) request.getAttribute("accessUser");
+        Map<String, Object> returnMap = importPaperService.saveBlankPaper(courseNo, courseName, paperName, user);
+        if (returnMap.get("msg").equals("success")) {
+            return new ResponseEntity(returnMap, HttpStatus.OK);
         } else {
-            return new ResponseEntity(msg, HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity(returnMap, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 

cqb-paper/src/main/java/com/qmth/cqb/paper/web/PaperController.java

@@ -10,6 +10,8 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -38,6 +40,7 @@ import com.qmth.cqb.question.model.Question;
 import com.qmth.cqb.utils.StringSimilarityUtils;
 
 import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 import io.swagger.annotations.ApiOperation;
 
 /**
@@ -93,8 +96,12 @@ public class PaperController {
      */
     @ApiOperation(value = "查询所有导入试卷", notes = "查询所有导入试卷")
     @GetMapping(value = "/importPaper/{curPage}/{pageSize}")
-    public ResponseEntity getImportPapers(@ModelAttribute PaperSearchInfo paperSearchInfo, @PathVariable int curPage,
-            @PathVariable int pageSize) {
+    public ResponseEntity getImportPapers( HttpServletRequest request, 
+                                            @ModelAttribute PaperSearchInfo paperSearchInfo, 
+                                            @PathVariable int curPage,
+                                            @PathVariable int pageSize) {
+        AccessUser user = (AccessUser) request.getAttribute("accessUser");
+        paperSearchInfo.setOrgId(user.getOrgId().toString());
         return new ResponseEntity(paperService.getImportPapers(paperSearchInfo, curPage, pageSize), HttpStatus.OK);
     }
 
@@ -108,8 +115,12 @@ public class PaperController {
      */
     @ApiOperation(value = "查询所有已组试卷", notes = "查询所有已组试卷")
     @GetMapping(value = "/genPaper/{curPage}/{pageSize}")
-    public ResponseEntity getGenPapers(@ModelAttribute PaperSearchInfo paperSearchInfo, @PathVariable int curPage,
-            @PathVariable int pageSize) {
+    public ResponseEntity getGenPapers( HttpServletRequest request, 
+                                        @ModelAttribute PaperSearchInfo paperSearchInfo, 
+                                        @PathVariable int curPage,
+                                        @PathVariable int pageSize) {
+        AccessUser user = (AccessUser) request.getAttribute("accessUser");
+        paperSearchInfo.setOrgId(user.getOrgId().toString());
         return new ResponseEntity(paperService.getGenPapers(paperSearchInfo, curPage, pageSize), HttpStatus.OK);
     }
 
@@ -275,9 +286,12 @@ public class PaperController {
      */
     @ApiOperation(value = "向导入试卷中的新增试题", notes = "向导入试卷中的新增试题")
     @PostMapping(value = "/paper/addQuestion/{paperId}/{paperDetailId}")
-    public ResponseEntity insertQuestionToPaper(@PathVariable String paperId, @PathVariable String paperDetailId,
-            @RequestBody Question question) {
-        return new ResponseEntity(paperService.insertQuestionToPaper(paperId, paperDetailId, question), HttpStatus.OK);
+    public ResponseEntity insertQuestionToPaper(HttpServletRequest request,
+                                                @PathVariable String paperId, 
+                                                @PathVariable String paperDetailId,
+                                                @RequestBody Question question) {
+        AccessUser user = (AccessUser) request.getAttribute("accessUser");
+        return new ResponseEntity(paperService.insertQuestionToPaper(paperId, paperDetailId, question,user), HttpStatus.OK);
 
     }
 
@@ -388,10 +402,10 @@ public class PaperController {
      */
     @ApiOperation(value = "向导入试卷中的新增试题", notes = "向导入试卷中的新增试题")
     @PostMapping(value = "/paper/selectQuestions/{paperId}/{paperDetailId}")
-    public ResponseEntity selectQuestionsToPaper(@PathVariable String paperId, @PathVariable String paperDetailId,
-            @RequestBody List<Question> questions) {
-        return new ResponseEntity(paperService.selectQuestionsToPaper(paperId, paperDetailId, questions),
-                HttpStatus.OK);
+    public ResponseEntity selectQuestionsToPaper(@PathVariable String paperId, 
+                                                @PathVariable String paperDetailId,
+                                                @RequestBody List<Question> questions) {
+        return new ResponseEntity(paperService.selectQuestionsToPaper(paperId, paperDetailId, questions),HttpStatus.OK);
 
     }
 

cqb-paper/src/main/java/com/qmth/cqb/paper/web/PaperStructController.java

@@ -1,20 +1,31 @@
 package com.qmth.cqb.paper.web;
 
-import com.qmth.cqb.paper.dao.PaperStructRepo;
-import com.qmth.cqb.paper.model.PaperStructSearchInfo;
-import com.qmth.cqb.utils.CommonUtils;
-import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+import com.qmth.cqb.paper.dao.PaperStructRepo;
 import com.qmth.cqb.paper.model.PaperStruct;
+import com.qmth.cqb.paper.model.PaperStructSearchInfo;
 import com.qmth.cqb.paper.service.PaperStructService;
 
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * Created by songyue on 16/12/28.
@@ -22,8 +33,8 @@ import java.util.stream.Stream;
 @RestController
 @RequestMapping("${api_cqb}/")
 public class PaperStructController {
-	
-	@Autowired
+
+    @Autowired
     PaperStructService paperStructService;
 
     @Autowired
@@ -31,75 +42,83 @@ public class PaperStructController {
 
     /**
      * 获取所有试卷结构
+     * 
      * @param
      * @return
      */
-    @ApiOperation(value="获取试卷结构带分页",notes="获取试卷结构带分页")
+    @ApiOperation(value = "获取试卷结构带分页", notes = "获取试卷结构带分页")
     @GetMapping(value = "/paperStruct/{curPage}/{pageSize}")
-    public ResponseEntity getPaperStructs(@ModelAttribute PaperStructSearchInfo searchInfo,
-                                                @PathVariable int curPage,
-                                                @PathVariable int pageSize){
-        return new ResponseEntity(paperStructService.getPaperStructs(searchInfo,curPage,pageSize),
-                HttpStatus.OK);
+    public ResponseEntity getPaperStructs(  HttpServletRequest request,
+                                            @ModelAttribute PaperStructSearchInfo searchInfo, 
+                                            @PathVariable int curPage,
+                                            @PathVariable int pageSize) {
+        AccessUser user = (AccessUser) request.getAttribute("accessUser");
+        return new ResponseEntity(paperStructService.getPaperStructs(searchInfo, curPage, pageSize,user), HttpStatus.OK);
     }
 
     /**
      * 获取所有试卷结构
+     * 
      * @param
      * @return
      */
-    @ApiOperation(value="获取试卷结构",notes="获取试卷结构")
+    @ApiOperation(value = "获取试卷结构", notes = "获取试卷结构")
     @GetMapping(value = "/paperStruct")
-    public ResponseEntity findAll(){
+    public ResponseEntity findAll() {
         return new ResponseEntity(paperStructRepo.findAll(), HttpStatus.OK);
     }
-	
+
     /**
      * 根据id获取试卷结构
-     * @param 
+     * 
+     * @param
      * @return
      */
-    @ApiOperation(value="获取试卷结构",notes="获取试卷结构")
+    @ApiOperation(value = "获取试卷结构", notes = "获取试卷结构")
     @GetMapping(value = "/paperStruct/{id}")
-    public ResponseEntity getPaperStructById(@PathVariable String id){
-        return new ResponseEntity(paperStructRepo.findOne(id),HttpStatus.OK);
+    public ResponseEntity getPaperStructById(@PathVariable String id) {
+        return new ResponseEntity(paperStructRepo.findOne(id), HttpStatus.OK);
     }
-    
 
     /**
      * 更新试卷结构
-     * @param 
+     * 
+     * @param
      * @return
      */
-    @ApiOperation(value="更新试卷结构",notes="更新试卷结构")
+    @ApiOperation(value = "更新试卷结构", notes = "更新试卷结构")
     @PutMapping(value = "/paperStruct")
-    public ResponseEntity updatePaperStruct(@RequestBody PaperStruct ps){
-    	PaperStruct paperStruct = paperStructService.save(ps);
-    	return new ResponseEntity(paperStruct,HttpStatus.OK);
+    public ResponseEntity updatePaperStruct(HttpServletRequest request, @RequestBody PaperStruct ps) {
+        AccessUser user = (AccessUser) request.getAttribute("accessUser");
+        PaperStruct paperStruct = paperStructService.save(ps, user);
+        return new ResponseEntity(paperStruct, HttpStatus.OK);
     }
 
     /**
      * 新增试卷结构
+     * 
      * @param ps
      * @return
      */
-    @ApiOperation(value="新增试卷结构",notes="新增试卷结构")
+    @ApiOperation(value = "新增试卷结构", notes = "新增试卷结构")
     @PostMapping(value = "/paperStruct")
-    public ResponseEntity addPaperStruct(@RequestBody PaperStruct ps){
-        PaperStruct paperStruct = paperStructService.save(ps);
-    	return new ResponseEntity(paperStruct,HttpStatus.OK);
+    public ResponseEntity addPaperStruct(HttpServletRequest request, @RequestBody PaperStruct ps) {
+        AccessUser user = (AccessUser) request.getAttribute("accessUser");
+        PaperStruct paperStruct = paperStructService.save(ps, user);
+        return new ResponseEntity(paperStruct, HttpStatus.OK);
     }
 
     /**
      * 删除试卷结构
+     * 
      * @param ids
      * @return
      */
-    @ApiOperation(value="删除试卷结构",notes="删除试卷结构")
+    @ApiOperation(value = "删除试卷结构", notes = "删除试卷结构")
     @DeleteMapping(value = "/paperStruct/{ids}")
-    public ResponseEntity removePaperStruct(@PathVariable String ids){
+    public ResponseEntity removePaperStruct(@PathVariable String ids) {
         List<String> paperList = Stream.of(ids.split(",")).collect(Collectors.toList());
-    	paperStructRepo.delete(paperStructRepo.findAll(paperList));
-		return new ResponseEntity(HttpStatus.OK);
+        paperStructRepo.delete(paperStructRepo.findAll(paperList));
+        return new ResponseEntity(HttpStatus.OK);
     }
 }

cqb-question-resource/pom.xml

@@ -16,7 +16,7 @@
     </properties>
 
     <dependencies>
-        <dependency>
+            <dependency>
             <groupId>com.qmth.cqb</groupId>
             <artifactId>cqb-comm-utils</artifactId>
             <version>${project.version}</version>

cqb-question-resource/src/main/java/com/qmth/cqb/question/model/Question.java

@@ -1,15 +1,17 @@
 package com.qmth.cqb.question.model;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
-import com.qmth.cqb.utils.CommonUtils;
-import com.qmth.cqb.utils.word.DocxProcessUtil;
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.springframework.data.annotation.Id;
-
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.springframework.data.annotation.Id;
+
+import com.qmth.cqb.utils.CommonUtils;
+import com.qmth.cqb.utils.word.DocxProcessUtil;
+
+import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+
 /**
  * Created by songyue on 16/12/27.
  */
@@ -46,11 +48,13 @@ public class Question implements Serializable {
 
     private List<Question> subQuestions;// 子题目,用于套题
 
-    private Double score;//预设分值
+    private Double score;// 预设分值
+
+    private String courseNo;// 课程CODE
 
-    private String courseNo;//课程CODE
+    private String courseName;// 课程名称
 
-    private String courseName;//课程名称
+    private String orgId; // 机构ID
 
     private Map<String, String> quesParams;// 试题属性
 
@@ -214,4 +218,13 @@ public class Question implements Serializable {
     public void setCourseName(String courseName) {
         this.courseName = courseName;
     }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
 }

cqb-question-resource/src/main/java/com/qmth/cqb/question/model/QuestionBak.java

@@ -47,6 +47,12 @@ public class QuestionBak implements Serializable {
 
     private Double score;// 预设分值
 
+    private String courseNo;// 课程CODE
+
+    private String courseName;// 课程名称
+
+    private String orgId; // 机构ID
+
     private Map<String, String> quesParams;// 试题属性
 
     public String getId() {
@@ -189,4 +195,29 @@ public class QuestionBak implements Serializable {
     public QuestionBak() {
         this.createTime = CommonUtils.getCurDateTime();
     }
+
+    public String getCourseNo() {
+        return courseNo;
+    }
+
+    public void setCourseNo(String courseNo) {
+        this.courseNo = courseNo;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
 }

cqb-question-resource/src/main/java/com/qmth/cqb/question/model/QuestionSearchCondition.java

@@ -20,6 +20,8 @@ public class QuestionSearchCondition {
 
     private String courseNo;// 课程CODE
 
+    private String orgId;
+
     public String getId() {
         return id;
     }
@@ -65,11 +67,19 @@ public class QuestionSearchCondition {
     }
 
     public void setCourseNo(String courseNo) {
-    	if(StringUtils.isBlank(courseNo)){
-    		this.courseNo = null;
-    	}else{
-    		this.courseNo = courseNo;
-    	}
+        if (StringUtils.isBlank(courseNo)) {
+            this.courseNo = null;
+        } else {
+            this.courseNo = courseNo;
+        }
+    }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
     }
 
 }

cqb-question-resource/src/main/java/com/qmth/cqb/question/web/QuesController.java

@@ -2,6 +2,8 @@ package com.qmth.cqb.question.web;
 
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -21,6 +23,7 @@ import com.qmth.cqb.question.model.Question;
 import com.qmth.cqb.question.model.QuestionSearchCondition;
 import com.qmth.cqb.question.service.QuesService;
 
+import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 import io.swagger.annotations.ApiOperation;
 
 /**
@@ -60,8 +63,12 @@ public class QuesController {
      */
     @ApiOperation(value = "分页查询试题", notes = "分页查询试题")
     @GetMapping(value = "/question/{curPage}/{pageSize}")
-    public ResponseEntity getAllQuestion(@ModelAttribute QuestionSearchCondition searchCondition,
-            @PathVariable int curPage, @PathVariable int pageSize) {
+    public ResponseEntity getAllQuestion(HttpServletRequest request,
+                                        @ModelAttribute QuestionSearchCondition searchCondition,
+                                        @PathVariable int curPage, 
+                                        @PathVariable int pageSize) {
+        AccessUser user = (AccessUser) request.getAttribute("accessUser");
+        searchCondition.setOrgId(user.getOrgId().toString());
         return new ResponseEntity(quesService.findAll(searchCondition, curPage, pageSize), HttpStatus.OK);
     }
 
@@ -86,7 +93,8 @@ public class QuesController {
      */
     @ApiOperation(value = "新增试题", notes = "新增试题")
     @PostMapping(value = "/question")
-    public ResponseEntity addQuestion(@RequestBody Question question) {
+    public ResponseEntity addQuestion(HttpServletRequest request,
+                                      @RequestBody Question question) {
         return new ResponseEntity(quesRepo.save(question), HttpStatus.CREATED);
     }
 

cqb-starter/src/main/resources/application-dev.properties

@@ -1,3 +1,3 @@
 spring.data.mongodb.uri=mongodb://192.168.1.99:27017/comm-ques-bank
 spring.data.mongodb.grid-fs-database=comm-ques-bank
-eureka.client.serviceUrl.defaultZone=http://192.168.1.88:1111/eureka/
+eureka.client.serviceUrl.defaultZone=http://192.168.1.161:1111/eureka/

cqb-starter/src/main/resources/application-test.properties

@@ -1,3 +1,3 @@
-spring.data.mongodb.uri=mongodb://192.168.1.74:27017/comm-ques-bank
-spring.data.mongodb.grid-fs-database=comm-ques-bank
+spring.data.mongodb.uri=mongodb://192.168.1.74:27017/comm-ques-bank
+spring.data.mongodb.grid-fs-database=comm-ques-bank
 eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/

cqb-starter/src/main/resources/log4j2.xml

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT" follow="true">
-            <PatternLayout>
-                <pattern>%d %p %C{1.} [%t] %m%n</pattern>
-            </PatternLayout>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <!-- 输出info级别信息 -->
-        <Root level="info">
-            <AppenderRef ref="Console" />
-        </Root>
-        <Logger name="org.docx4j" level="off" />
-
-    </Loggers>
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT" follow="true">
+            <PatternLayout charset="UTF-8">
+                <pattern>%d %p %C{1.} [%t] %m%n</pattern>
+            </PatternLayout>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <!-- 输出info级别信息 -->
+        <Root level="info">
+            <AppenderRef ref="Console" />
+        </Root>
+        <Logger name="org.docx4j" level="debug" />
+
+    </Loggers>
 </Configuration>

cqb-starter/src/test/java/com/qmth/cqb/AppTest.java

@@ -174,7 +174,7 @@ public class AppTest {
         examPaper.setCourseCode("1");
         examPaper.setExtractCount(1);
         examPaper.setGroupCode("1");
-       // examPaper.setPaperId("58b3e0b06def240e05b0c0e1");
+//        examPaper.setPaperId("58b3e0b06def240e05b0c0e1");
         examPaperRepo.save(examPaper);
 
         ExtractConfig extractConfig = new ExtractConfig();