后端mastert提交

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/ExportStructureController.java

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiOperation;
 
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
@@ -38,31 +36,27 @@ public class ExportStructureController extends ControllerSupport{
 	
 	@ApiOperation(value = "保存导出结构", notes = "保存导出结构")
     @PostMapping(value = "/saveExportStructure")
-	public ResponseEntity saveExportStructure(HttpServletRequest request,@RequestBody ExportStructure exportStructure){
+	public ResponseEntity<Object> saveExportStructure(@RequestBody ExportStructure exportStructure){
 		try{
 			User user = getAccessUser();
-			//AccessUser user = (AccessUser) request.getAttribute("accessUser");
 			exportStructureService.saveExportStructure(exportStructure,user);
-			return new ResponseEntity(HttpStatus.OK);
+			return new ResponseEntity<Object>(HttpStatus.OK);
 		}catch(Exception e){
-			return new ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR);
+			return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 	
 	@ApiOperation(value = "分页查询导出结构", notes = "分页查询导出结构")
     @PostMapping(value = "/findPageByExportStructure/{curPage}/{pageSize}")
-	public ResponseEntity findPageByExportStructure(HttpServletRequest request,
-													@PathVariable int curPage,
-													@PathVariable int pageSize,
-													@RequestBody ExportStructure exportStructure){
+	public ResponseEntity<Object> findPageByExportStructure(@PathVariable int curPage, @PathVariable int pageSize,
+															@RequestBody ExportStructure exportStructure){
 		try{
 			User user = getAccessUser();
-			//AccessUser user = (AccessUser) request.getAttribute("accessUser");
 			exportStructure.setOrgId(user.getRootOrgId()+"");
 			Page<ExportStructure> pageExportStructure = exportStructureService.findPageByExportStructure(exportStructure, curPage, pageSize);
-			return new ResponseEntity(pageExportStructure,HttpStatus.OK);
+			return new ResponseEntity<Object>(pageExportStructure,HttpStatus.OK);
 		}catch(Exception e){
-			return new ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR);
+			return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 	
@@ -76,16 +70,17 @@ public class ExportStructureController extends ControllerSupport{
 	
 	@ApiOperation(value="根据考试类型查询考试id",notes="根据考试类型查询考试id")
 	@GetMapping(value="/findExportStructureByExamType/{examType}")
-	public ResponseEntity findExportStructureByExamType(@PathVariable String examType){
-		List<String> list = exportStructureService.findExportStructureByExamType(examType);
-		return new ResponseEntity(list,HttpStatus.OK);
+	public ResponseEntity<Object> findExportStructureByExamType(@PathVariable String examType){
+		User user = getAccessUser();
+		List<String> list = exportStructureService.findExportStructureByExamType(examType,user);
+		return new ResponseEntity<Object>(list,HttpStatus.OK);
 	}
 	
 	@ApiOperation(value="根据导出结构id删除",notes="根据导出结构删除")
 	@DeleteMapping(value="/deleteExportStructure/{id}")
-	public ResponseEntity deleteExportStructure(@PathVariable String id){
+	public ResponseEntity<Object> deleteExportStructure(@PathVariable String id){
 		exportStructureService.deleteExportStructure(id);
-		return new ResponseEntity(HttpStatus.OK);
+		return new ResponseEntity<Object>(HttpStatus.OK);
 	}
 }
 

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ExportStructureService.java

@@ -49,7 +49,7 @@ public interface ExportStructureService {
 	 * @param examType
 	 * @return
 	 */
-	public List<String> findExportStructureByExamType(String examType);
+	public List<String> findExportStructureByExamType(String examType,User user);
 	
 	/**
 	 * 根据导出结构id删除

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExportStructureServiceImpl.java

@@ -81,9 +81,8 @@ public class ExportStructureServiceImpl implements ExportStructureService {
 		Query query = new Query();
 		query.addCriteria(Criteria.where("orgId").is(orgId));
 		query.addCriteria(Criteria.where("examId").is(examId));
-		long count = this.mongoTemplate.count(query, ExportStructure.class);
 		List<ExportStructure> list = this.mongoTemplate.find(query, ExportStructure.class);
-		if(list.size()>0){
+		if(list!=null&&list.size()>0){
 			return list.get(0);
 		}
 		return null;
@@ -130,8 +129,11 @@ public class ExportStructureServiceImpl implements ExportStructureService {
 	}
 
 	@Override
-	public List<String> findExportStructureByExamType(String examType) {
-		List<ExportStructure> exportStructures = exportStructureRepo.findAll(Example.of(new ExportStructure(ExamType.strToEnum(examType))));
+	public List<String> findExportStructureByExamType(String examType,User user) {
+		Query query = new Query();
+		query.addCriteria(Criteria.where("orgId").is(user.getRootOrgId()+""));
+		query.addCriteria(Criteria.where("examType").is(examType));
+		List<ExportStructure> exportStructures = this.mongoTemplate.find(query, ExportStructure.class);
 		if(exportStructures.size()>0){
 			List<String> list = new ArrayList<String>();
 			for(int i=0;i<exportStructures.size();i++){
@@ -165,7 +167,6 @@ public class ExportStructureServiceImpl implements ExportStructureService {
 			update.set("ifFinish", 0);
 			update.unset("finishedPaperIdMap");
 			mongoTemplate.updateMulti(query, update, ExtractConfig.class);
-			
 			exportStructureRepo.delete(exportStructure);
 		}
 	}

examcloud-core-questions-starter/src/main/resources/application-dev.properties

@@ -1,11 +1,13 @@
 #spring.data.mongodb.uri=mongodb://root:Qmth87863577@127.0.0.1:6600/comm-ques-bank?authSource=admin&authMechanism=SCRAM-SHA-1
-spring.data.mongodb.uri=mongodb://192.168.10.30:27017/comm-ques-bank
-spring.data.mongodb.grid-fs-database=comm-ques-bank
-spring.data.mongodb.database=comm-ques-bank
-eureka.client.serviceUrl.defaultZone=http://192.168.10.30:1111/eureka/
-spring.application.name=ExamCloud-service-question
+spring.data.mongodb.uri=mongodb://192.168.10.30:27017/exam_cloud_question_kf
+#spring.data.mongodb.grid-fs-database=comm-ques-bank
+#spring.data.mongodb.database=comm-ques-bank
+spring.data.mongodb.grid-fs-database=exam_cloud_question_kf
+spring.data.mongodb.database=exam_cloud_question_kf
+eureka.client.serviceUrl.defaultZone=http://192.168.10.39:1111/eureka/
+spring.application.name=EC-CORE-QUESTION
 
-spring.redis.host=192.168.10.30
+spring.redis.host=192.168.10.39
 spring.redis.port=6379
 
 upyun.bucketName=exam-cloud-test
@@ -19,7 +21,7 @@ upyun.downloadDirectory=paperDirectory
 upyun.zipDirectory=paperZipDirectory
 upyun.radioType=mp3,wma
 
-spring.datasource.url=jdbc:mysql://192.168.10.30:3306/exam_cloud_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+spring.datasource.url=jdbc:mysql://192.168.10.30:3306/exam_cloud_kf?useUnicode=true&characterEncoding=UTF-8&useSSL=false
 spring.datasource.username=root
 spring.datasource.password=root
 spring.datasource.validation-query=SELECT 1 FROM DUAL