[dev] add vat the same entity with admin entity droped

atms-gen/config/hibernate.cfg.xml

@@ -20,7 +20,7 @@
         <mapping class="pwc.taxtech.atms.vat.entity.CustBalanceStd"/>
         <mapping class="pwc.taxtech.atms.vat.entity.CustBalanceStdManual"/>
         <mapping class="pwc.taxtech.atms.vat.entity.CustomsInvoice"/>
-        <mapping class="pwc.taxtech.drop.vat.EnterpriseAccount"/>
+        <mapping class="pwc.taxtech.atms.vat.entity.EnterpriseAccount"/>
         <mapping class="pwc.taxtech.atms.vat.entity.EntriesCheckDetailResult"/>
         <mapping class="pwc.taxtech.atms.vat.entity.EntriesCheckResult"/>
         <mapping class="pwc.taxtech.atms.vat.entity.FormulaCache"/>
@@ -35,11 +35,11 @@
         <mapping class="pwc.taxtech.atms.vat.entity.ModelCategoryResult"/>
         <mapping class="pwc.taxtech.atms.vat.entity.ModelDetailLog"/>
         <mapping class="pwc.taxtech.atms.vat.entity.ModelLog"/>
-        <mapping class="pwc.taxtech.drop.vat.OperationLog"/>
+        <mapping class="pwc.taxtech.atms.vat.entity.OperationLog"/>
         <mapping class="pwc.taxtech.atms.vat.entity.OutputVatInvoice"/>
         <mapping class="pwc.taxtech.atms.vat.entity.OutputVatInvoiceItem"/>
         <mapping class="pwc.taxtech.atms.vat.entity.PeriodCellReference"/>
-        <mapping class="pwc.taxtech.drop.vat.StandardAccount"/>
+        <mapping class="pwc.taxtech.atms.vat.entity.StandardAccount"/>
         <mapping class="pwc.taxtech.atms.vat.entity.ValidationInfo"/>
         <mapping class="pwc.taxtech.atms.vat.entity.Voucher"/>
         <mapping class="pwc.taxtech.atms.vat.entity.VoucherMain"/>

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

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

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

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

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

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

atms-gen/src/main/java/pwc/taxtech/atms/vat/repository/EnterpriseAccountRepository.java

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

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

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

atms-gen/src/main/java/pwc/taxtech/atms/vat/repository/StandardAccountRepository.java

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

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

@@ -16,7 +16,7 @@ public class ExtractCommitFromDiff {
 
     public static void main(String[] args) {
         try (BufferedReader burReader = new BufferedReader(new InputStreamReader(new FileInputStream(new File(
-                "C:\\Users\\Neo Wang\\workspace\\atms\\atms-gen\\target\\test-classes\\diff.txt"))))) {
+                "C:\\Users\\Neo Wang\\workspace\\atms\\atms-gen\\target\\test-classes\\diff"))))) {
             String line = null;
             List<Diff> diffs = new ArrayList<>();
             Diff diff = null;
@@ -26,8 +26,8 @@ public class ExtractCommitFromDiff {
                     if (diff != null) diffs.add(diff);
 
                     diff = new Diff();
-                    diff.fileName = line.substring(line.lastIndexOf("/atms-dao") + 1, line.length());
-                } else if (line.startsWith("+") || line.startsWith("-")) {
+     diff.fileName = line.substring(line.lastIndexOf("/ atms-dao") + 1, line.length());
+    } else if (line.startsWith("+") || line.s   rtsWith("-")) {
                     if (line.startsWith("++") || line.startsWith("--")) continue;
                     if (diff == null) {
                         System.out.println(line);
@@ -40,8 +40,8 @@ public class ExtractCommitFromDiff {
             List<Diff> orderDiffs = diffs.stream().sorted(Comparator.comparing(Diff::length)).collect(Collectors.toList());
 
             orderDiffs.forEach(m -> {
-                if (m.fileName.contains("Example") ) {
-                    System.out.println(m.fileName);
+                if (m.fileName.contains("java")) {
+                    System.out.println(m.toString());
                 }
             });
         } catch (FileNotFoundException e) {
@@ -60,8 +60,7 @@ public class ExtractCommitFromDiff {
             StringBuilder builder = new StringBuilder(fileName);
             builder.append(LINE_SPLITER);
             diffLine.forEach(m -> {
-                if (!m.contains("*") && !m.contains("deleteByPrimaryKey") && !m.contains("selectByPrimaryKey")
-                        && !m.contains("import") && m.trim().length() > 1)
+                if (!m.contains("*") && !m.contains("import") && m.trim().length() > 1)
                     builder.append(m).append(LINE_SPLITER);
             });
 
@@ -70,10 +69,8 @@ public class ExtractCommitFromDiff {
 
         public int length() {
             return diffLine.stream().filter(m -> {
-                return !m.contains("*") && !m.contains("deleteByPrimaryKey") && !m.contains("selectByPrimaryKey")
-                        && !m.contains("import") && m.trim().length() > 1;
+                return !m.contains("*") && !m.contains("import") && m.trim().length() > 1;
             }).collect(Collectors.toList()).size();
         }
     }
 }
-