代码提交

service-paper/pom.xml

@@ -46,6 +46,11 @@
             <artifactId>servlet-api</artifactId>
             <version>2.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+            <version>2.1.8.RELEASE</version>
+        </dependency>
     </dependencies>
 
 

service-paper/service-paper.iml

@@ -55,12 +55,23 @@
     <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.4.Final" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.0.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.13" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.22" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
@@ -76,7 +87,6 @@
     <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
     <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
     <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
@@ -86,8 +96,6 @@
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
     <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
     <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-test:5.0.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.0.2.RELEASE" level="project" />
@@ -100,7 +108,6 @@
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.0.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.0.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.3.0" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.3.0" level="project" />
@@ -109,7 +116,6 @@
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.0.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.0.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:9.7.0" level="project" />

service-paper/src/main/java/com/jty/wsxt/domain/DomainRegistry.java

 package com.jty.wsxt.domain;
 
+import com.jty.wsxt.domain.model.module.ModuleRepository;
+import com.jty.wsxt.domain.model.paper.PaperRepository;
+import com.jty.wsxt.domain.model.subject.SubjectRepository;
+import com.jty.wsxt.domain.model.type.TypeRepository;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -16,6 +20,22 @@ public class DomainRegistry implements ApplicationContextAware {
 
     private static ApplicationContext applicationContext;
 
+    public static ModuleRepository moduleRepository(){
+        return applicationContext.getBean(ModuleRepository.class);
+    }
+
+    public static PaperRepository paperRepository(){
+        return applicationContext.getBean(PaperRepository.class);
+    }
+
+    public static SubjectRepository subjectRepository(){
+        return applicationContext.getBean(SubjectRepository.class);
+    }
+
+    public static TypeRepository typeRepository(){
+        return applicationContext.getBean(TypeRepository.class);
+    }
+
     @Override
     public synchronized void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         if(DomainRegistry.applicationContext==null) {

service-paper/src/main/java/com/jty/wsxt/domain/lombok.config

+config.stopBubbling=true
+lombok.equalsAndHashCode.callSuper=call
\ No newline at end of file

service-paper/src/main/java/com/jty/wsxt/domain/model/module/Module.java

+package com.jty.wsxt.domain.model.module;
+
+import com.jty.wsxt.domain.shared.IdentifiedEntityObject;
+import lombok.Data;
+
+import javax.persistence.Entity;
+
+/**
+ * Module
+ *
+ * @author Manjiajie
+ * @since 2019-6-21 10:37:33
+ */
+@Data
+@Entity
+public class Module extends IdentifiedEntityObject<Module> {
+
+    private String name;
+
+    private String ordinal;
+
+    private Integer typeId;
+
+    @Override
+    public boolean sameIdentityAs(Module other) {
+        return false;
+    }
+}

service-paper/src/main/java/com/jty/wsxt/domain/model/module/ModuleRepository.java

+package com.jty.wsxt.domain.model.module;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * ModuleRepository
+ *
+ * @author Manjiajie
+ * @since 2019-6-21 11:17:11
+ */
+public interface ModuleRepository extends JpaRepository<Module,Integer> {
+}

service-paper/src/main/java/com/jty/wsxt/domain/model/paper/Paper.java

+package com.jty.wsxt.domain.model.paper;
+
+import com.jty.wsxt.domain.model.module.Module;
+import com.jty.wsxt.domain.shared.IdentifiedEntityObject;
+import lombok.Data;
+
+import javax.persistence.Entity;
+
+/**
+ * Paper
+ *
+ * @author Manjiajie
+ * @since 2019-6-21 10:41:39
+ */
+@Data
+@Entity
+public class Paper extends IdentifiedEntityObject<Module> {
+
+    private String name;
+
+    private Integer moduleId;
+
+    private Integer creatorId;
+
+    private Integer subjectId;
+
+    private Integer typeId;
+
+    private Integer specialistId;
+
+    private String answer;
+
+    private String firstFeedback;
+
+    private String secondFeedback;
+
+    @Override
+    public boolean sameIdentityAs(Module other) {
+        return false;
+    }
+}

service-paper/src/main/java/com/jty/wsxt/domain/model/paper/PaperRepository.java

+package com.jty.wsxt.domain.model.paper;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * PaperRepository
+ *
+ * @author Manjiajie
+ * @since 2019-6-21 11:17:05
+ */
+public interface PaperRepository  extends JpaRepository<Paper,Integer> {
+}

service-paper/src/main/java/com/jty/wsxt/domain/model/subject/Subject.java

+package com.jty.wsxt.domain.model.subject;
+
+import com.jty.wsxt.domain.shared.IdentifiedEntityObject;
+import lombok.Data;
+
+import javax.persistence.Entity;
+
+/**
+ * Subject
+ *
+ * @author Manjiajie
+ * @since 2019-6-21 10:22:58
+ */
+@Data
+@Entity
+public class Subject extends IdentifiedEntityObject<Subject> {
+
+    private String name;
+
+    private String ordinal;
+
+    @Override
+    public boolean sameIdentityAs(Subject other) {
+        return false;
+    }
+}

service-paper/src/main/java/com/jty/wsxt/domain/model/subject/SubjectRepository.java

+package com.jty.wsxt.domain.model.subject;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * SubjectRepository
+ *
+ * @author Manjiajie
+ * @since 2019-6-21 11:17:43
+ */
+public interface SubjectRepository extends JpaRepository<Subject,Integer> {
+}

service-paper/src/main/java/com/jty/wsxt/domain/model/type/Type.java

+package com.jty.wsxt.domain.model.type;
+
+import com.jty.wsxt.domain.shared.IdentifiedEntityObject;
+import lombok.Data;
+
+import javax.persistence.Entity;
+
+/**
+ * Type
+ *
+ * @author Manjiajie
+ * @since 2019-6-21 10:26:23
+ */
+@Data
+@Entity
+public class Type extends IdentifiedEntityObject<Type> {
+
+    private String name;
+
+    private Integer subjectId;
+
+    private String ordinal;
+
+    @Override
+    public boolean sameIdentityAs(Type other) {
+        return false;
+    }
+}

service-paper/src/main/java/com/jty/wsxt/domain/model/type/TypeRepository.java

+package com.jty.wsxt.domain.model.type;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * TypeRepository
+ *
+ * @author Manjiajie
+ * @since 2019-6-21 11:18:51
+ */
+public interface TypeRepository extends JpaRepository<Type,Integer> {
+}