deason 5 жил өмнө
parent
commit
35d8ebce61

+ 49 - 12
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/CoursePropertyRepo.java

@@ -1,36 +1,73 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.CourseProperty;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.repository.query.QueryByExampleExecutor;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author weiwenhai
  * @describle 课程属性repo
  * @date 2017.11.2
  */
-public interface CoursePropertyRepo extends JpaRepository<CourseProperty, Long>, QueryByExampleExecutor<CourseProperty>, JpaSpecificationExecutor<CourseProperty> {
+@Component
+//public interface CoursePropertyRepo extends JpaRepository<CourseProperty, Long>, QueryByExampleExecutor<CourseProperty>, JpaSpecificationExecutor<CourseProperty> {
+public class CoursePropertyRepo {
 
     //查询所有课程属性
-    List<CourseProperty> findByOrgId(Long orgId);
+    public List<CourseProperty> findByOrgId(Long orgId) {
+        return Lists.newArrayList();
+    }
 
     //根据属性名查询
-    CourseProperty findByNameAndOrgId(String name, Long orgId);
+    public CourseProperty findByNameAndOrgId(String name, Long orgId) {
+        return null;
+    }
 
     //根据课程id查询
-    List<CourseProperty> findByCourseId(Long courseId);
+    public List<CourseProperty> findByCourseId(Long courseId) {
+        return Lists.newArrayList();
+    }
 
-    List<CourseProperty> findByCourseCode(String code);
+    public List<CourseProperty> findByCourseCode(String code) {
+        return Lists.newArrayList();
+    }
 
     //根据课程代码查询已开启的课程属性
-    List<CourseProperty> findByCourseCodeAndEnable(String code, Boolean enable);
+    public List<CourseProperty> findByCourseCodeAndEnable(String code, Boolean enable) {
+        return Lists.newArrayList();
+    }
 
     //根据课程id查询已经开启的课程属性
-    List<CourseProperty> findByCourseIdAndEnable(Long courseId, Boolean enable);
+    public List<CourseProperty> findByCourseIdAndEnable(Long courseId, Boolean enable) {
+        return Lists.newArrayList();
+    }
 
     //根据id集合查询
-    List<CourseProperty> findByIdIn(List<Long> ids);
-}
+    public List<CourseProperty> findByIdIn(List<Long> ids) {
+        return Lists.newArrayList();
+    }
+
+    public void save(CourseProperty courseProperty) {
+
+    }
+
+    public Page<CourseProperty> findAll(Specification<CourseProperty> specification, Pageable pageable) {
+        return new PageImpl<>(Lists.newArrayList(), pageable, 0l);
+    }
+
+    public Optional<CourseProperty> findById(Long id) {
+        return null;
+    }
+
+    public void saveAll(List<CourseProperty> courseProperties) {
+
+    }
+
+}

+ 41 - 5
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/PropertyRepo.java

@@ -1,26 +1,62 @@
 package cn.com.qmth.examcloud.core.questions.dao;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.Property;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.data.domain.Example;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author weiwenhai
  * @describle 课程属性repo
  * @date 2017.11.6
  */
-public interface PropertyRepo extends JpaRepository<Property, Long>, QueryByExampleExecutor<Property>, JpaSpecificationExecutor<Property> {
+@Component
+//public interface PropertyRepo extends JpaRepository<Property, Long>, QueryByExampleExecutor<Property>, JpaSpecificationExecutor<Property> {
+public class PropertyRepo {
 
     //查询所有节点
-    List<Property> findByOrgIdAndCoursePropertyIdAndParentIdOrderByNumber(Long orgId, Long coursePropertyId, Long parentId);
+    public List<Property> findByOrgIdAndCoursePropertyIdAndParentIdOrderByNumber(Long orgId, Long coursePropertyId, Long parentId) {
+        return Lists.newArrayList();
+    }
 
     //查询子节点
-    List<Property> findByParentIdOrderByNumber(Long parentId);
+    public List<Property> findByParentIdOrderByNumber(Long parentId) {
+        return Lists.newArrayList();
+    }
 
     //根据课程属性id,一级id,属性名称查询
-    Property findByOrgIdAndCoursePropertyIdAndParentIdAndName(Long orgId, Long coursePropertyId, Long parentId, String name);
+    public Property findByOrgIdAndCoursePropertyIdAndParentIdAndName(Long orgId, Long coursePropertyId, Long parentId, String name) {
+        return null;
+    }
 
-}
+    public List<Property> findAll(Example<Property> of) {
+        return Lists.newArrayList();
+    }
+
+    public Property save(Property property) {
+        return null;
+    }
+
+    public void saveAll(List<Property> properties) {
+
+    }
+
+    public Optional<Property> findById(Long id) {
+        return null;
+    }
+
+    public void delete(Property property) {
+
+    }
+
+    public void deleteById(Long propertyId) {
+
+    }
+
+}

+ 2 - 2
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/CourseProperty.java

@@ -12,8 +12,8 @@ import javax.validation.constraints.NotNull;
  * @describle 课程属性
  * @date 2017.11.2
  */
-@Entity
-@Table(name = "ecs_ques_course_property")
+//@Entity
+//@Table(name = "ecs_ques_course_property")
 public class CourseProperty extends IdEntity {
     @NotNull
     private String name;

+ 2 - 2
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/Property.java

@@ -11,8 +11,8 @@ import javax.validation.constraints.NotNull;
  * @describle 属性
  * @date 2017.11.6
  */
-@Entity
-@Table(name = "ecs_ques_property")
+//@Entity
+//@Table(name = "ecs_ques_property")
 public class Property extends IdEntity {
     @NotNull
     private String name;

+ 5 - 5
examcloud-core-questions-starter/src/main/java/cn/com/qmth/examcloud/core/questions/starter/QuestionPoolApplication.java

@@ -4,6 +4,7 @@ import cn.com.qmth.examcloud.web.bootstrap.AppBootstrap;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@@ -19,17 +20,16 @@ import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 /**
  * 项目入口主程序
  */
-@EnableJpaAuditing
+//@EnableJpaAuditing
 @EnableEurekaClient
 @EnableDiscoveryClient
 @SpringBootApplication
 @ComponentScan(basePackages = {"cn.com.qmth"})
-@EntityScan(basePackages = {"com.qmth.commons", "cn.com.qmth"})
-//@EnableJpaRepositories(basePackages = {"cn.com.qmth"}, repositoryBaseClass = BaseQueryDaoImpl.class)
-@EnableJpaRepositories(basePackages = {"cn.com.qmth"})
+//@EntityScan(basePackages = {"com.qmth.commons", "cn.com.qmth"})
+//@EnableJpaRepositories(basePackages = {"cn.com.qmth"})
 @EnableMongoRepositories("cn.com.qmth.examcloud.core.questions.dao")
 @EnableFeignClients(basePackages = {"cn.com.qmth.examcloud.core.questions.service.rpc"})
-@EnableAutoConfiguration(exclude = {MultipartAutoConfiguration.class})
+@EnableAutoConfiguration(exclude = {MultipartAutoConfiguration.class, DataSourceAutoConfiguration.class})
 public class QuestionPoolApplication {
 
     static {