[dev] drop admin jpa entity

atms-gen/src/main/java/pwc/taxtech/Const.java

@@ -2,7 +2,7 @@ package pwc.taxtech;
 
 public class Const {
     // oracle
-    public static final String DEF_BIG_STRING = "blob";
+    public static final String DEF_BIG_STRING = "varchar2(500 char) default ' '";
     public static final String DEF_DEFAULT_DATE = "date default sysdate";
     public static final String DEF_DEFAULT_STRING = "' '";
     public static final String DEF_DEFAULT_NUMBER = "0";

atms-gen/src/main/java/pwc/taxtech/drop/Model.java → atms-gen/src/main/java/pwc/taxtech/atms/entity/Model.java

-package pwc.taxtech.drop;
+package pwc.taxtech.atms.entity;
 
 import org.hibernate.annotations.ColumnDefault;
 

atms-gen/src/main/java/pwc/taxtech/drop/OperationLogRole.java → atms-gen/src/main/java/pwc/taxtech/atms/entity/OperationLogRole.java

-package pwc.taxtech.drop;
+package pwc.taxtech.atms.entity;
 
 import org.hibernate.annotations.ColumnDefault;
 

atms-gen/src/main/java/pwc/taxtech/atms/entity/OrgServiceTemplateGroup.java

+package pwc.taxtech.atms.entity;
+
+import org.hibernate.annotations.ColumnDefault;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Objects;
+
+import static pwc.taxtech.Const.*;
+
+@Entity
+@Table(name = "ORG_SERVICE_TEMPLATE_GROUP", schema = PROJECT_ADMIN, catalog = "")
+public class OrgServiceTemplateGroup {
+    private Long id;
+    private String organizationId;
+    private String serviceTypeId;
+    private Long templateGroupId;
+
+    @Id
+    @Column(name = "ID", nullable = false)
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Basic
+    @Column(name = "ORGANIZATION_ID", nullable = false, length = 128)
+    @ColumnDefault(DEF_DEFAULT_STRING)
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    public void setOrganizationId(String organizationId) {
+        this.organizationId = organizationId;
+    }
+
+    @Basic
+    @Column(name = "SERVICE_TYPE_ID", nullable = false, length = 128)
+    @ColumnDefault(DEF_DEFAULT_STRING)
+    public String getServiceTypeId() {
+        return serviceTypeId;
+    }
+
+    public void setServiceTypeId(String serviceTypeId) {
+        this.serviceTypeId = serviceTypeId;
+    }
+
+    @Basic
+    @Column(name = "TEMPLATE_GROUP_ID", nullable = false)
+    @ColumnDefault(DEF_DEFAULT_NUMBER)
+    public Long getTemplateGroupId() {
+        return templateGroupId;
+    }
+
+    public void setTemplateGroupId(Long templateGroupId) {
+        this.templateGroupId = templateGroupId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        OrgServiceTemplateGroup that = (OrgServiceTemplateGroup) o;
+        return id == that.id &&
+                templateGroupId == that.templateGroupId &&
+                Objects.equals(organizationId, that.organizationId) &&
+                Objects.equals(serviceTypeId, that.serviceTypeId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, organizationId, serviceTypeId, templateGroupId);
+    }
+}

atms-gen/src/main/java/pwc/taxtech/atms/repository/EntriesCheckDetailRepository.java

 package pwc.taxtech.atms.repository;
 
 import org.springframework.data.repository.CrudRepository;
-import pwc.taxtech.atms.entity.EntriesCheckDetail;
+import pwc.taxtech.drop.EntriesCheckDetail;
 
 public interface EntriesCheckDetailRepository extends CrudRepository<EntriesCheckDetail, String> {
 }
\ No newline at end of file

atms-gen/src/main/java/pwc/taxtech/atms/repository/ModelRepository.java

 package pwc.taxtech.atms.repository;
 
 import org.springframework.data.repository.CrudRepository;
-import pwc.taxtech.drop.Model;
+import pwc.taxtech.atms.entity.Model;
 
 public interface ModelRepository extends CrudRepository<Model, String> {
 }
\ No newline at end of file

atms-gen/src/main/java/pwc/taxtech/atms/repository/OperationLogRepository.java

 package pwc.taxtech.atms.repository;
 
 import org.springframework.data.repository.CrudRepository;
-import pwc.taxtech.atms.entity.OperationLog;
+import pwc.taxtech.drop.OperationLog;
 
 public interface OperationLogRepository extends CrudRepository<OperationLog, String> {
 }
\ No newline at end of file

atms-gen/src/main/java/pwc/taxtech/atms/repository/OperationLogRoleRepository.java

 package pwc.taxtech.atms.repository;
 
 import org.springframework.data.repository.CrudRepository;
-import pwc.taxtech.drop.OperationLogRole;
+import pwc.taxtech.atms.entity.OperationLogRole;
 
 public interface OperationLogRoleRepository extends CrudRepository<OperationLogRole, String> {
 }
\ No newline at end of file

atms-gen/src/main/java/pwc/taxtech/atms/repository/WorkflowRepository.java

 package pwc.taxtech.atms.repository;
 
 import org.springframework.data.repository.CrudRepository;
-import pwc.taxtech.atms.entity.Workflow;
+import pwc.taxtech.drop.Workflow;
 
 public interface WorkflowRepository extends CrudRepository<Workflow, String> {
 }
\ No newline at end of file

atms-gen/src/main/java/pwc/taxtech/atms/entity/EntriesCheckDetail.java → atms-gen/src/main/java/pwc/taxtech/drop/EntriesCheckDetail.java

-package pwc.taxtech.atms.entity;
+package pwc.taxtech.drop;
 
 import org.hibernate.annotations.ColumnDefault;
 

atms-gen/src/main/java/pwc/taxtech/atms/entity/OperationLog.java → atms-gen/src/main/java/pwc/taxtech/drop/OperationLog.java

-package pwc.taxtech.atms.entity;
+package pwc.taxtech.drop;
 
 import org.hibernate.annotations.ColumnDefault;
 

atms-gen/src/main/java/pwc/taxtech/atms/entity/Workflow.java → atms-gen/src/main/java/pwc/taxtech/drop/Workflow.java

-package pwc.taxtech.atms.entity;
+package pwc.taxtech.drop;
 
 import javax.persistence.Basic;
 import javax.persistence.Column;

atms-gen/src/test/java/resources/databases-invalid-sql → atms-gen/src/main/java/pwc/taxtech/drop/databases-invalid-sql

 表名超长
-organization_service_template_group -> org_service_template_group
+organization_service_template_group -> org_service_template_group *
 OutputInvoiceTriggerSyncHistory -> OutputInvoiceTriggerSyncHist
 OutputReconciliationConfiguration -> OutputReconciliationConfig
 OutputReconciliationEntityMapping -> OutputReconciliationMapping

atms-gen/src/main/resources/application-oracle.yml

@@ -9,5 +9,5 @@ spring:
       properties.hibernate:
           default_schema: tax_admin
       hibernate:
-          ddl-auto: update
+          ddl-auto: create
           naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl

atms-gen/src/test/java/com/neo/GenGeneratorXml.java

@@ -243,7 +243,7 @@ public class GenGeneratorXml {
                 "\n" +
                 "    <javaModelGenerator targetPackage=\"pwc.taxtech.atms" + (isAdmin ? "." : ".vat.") + "entity\" targetProject=\"../../src/main/java\">\n" +
                 "      <property name=\"trimStrings\" value=\"true\"/>\n" +
-                "      " + (isAdmin ? "<property name=\"rootClass\" value=\"pwc.taxtech.atms.entitiy.BaseEntity\"/>" : "") + "\n" +
+                "      " + (isAdmin ? "<property name=\"rootClass\" value=\"pwc.taxtech.atms.entity.BaseEntity\"/>" : "") + "\n" +
                 "    </javaModelGenerator>\n" +
                 "\n" +
                 "    <sqlMapGenerator targetPackage=\"pwc.taxtech.atms" + (isAdmin ? "." : ".vat.") + "dao\" targetProject=\"../../src/main/resources\">\n" +