Explorar o código

Merge branch 'dev-excel0521' into dev-to-user-1

chenendian hai 1 mes
pai
achega
f5e116ec0d
Modificáronse 53 ficheiros con 5029 adicións e 1239 borrados
  1. 6 6
      siwei-modules/pom.xml
  2. 2975 218
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/common/Constant.java
  3. 21 11
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/JsydghxkController.java
  4. 7 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/ThematicController.java
  5. 4 5
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/ParcelAnalysisController.java
  6. 99 4
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/third/DealExcelController.java
  7. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Gyjsydscdj.java
  8. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Jsgcghxk.java
  9. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Jsydghxk.java
  10. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Tdgy.java
  11. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Tdhyhs.java
  12. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Tjyydhx.java
  13. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Ydbp.java
  14. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/YdbpData.java
  15. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Ydysyxz.java
  16. 36 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/cadastre/Zdbhqk.java
  17. 5 1
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/FwmxVo.java
  18. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/GyjsydscdjVo.java
  19. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/JsgcghxkVo.java
  20. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/JsydghxkVo.java
  21. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/TdgyVo.java
  22. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/TdhyhsVo.java
  23. 3 1
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/TjyydhxVo.java
  24. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/YdbpDataVo.java
  25. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/YdbpVo.java
  26. 1 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/YdysyxzVo.java
  27. 8 4
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/CadastreFileMapper.java
  28. 4 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/ProjectMapper.java
  29. 2 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/TdgyMapper.java
  30. 36 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/cadastre/ZdbhqkMapper.java
  31. 17 1
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/cadastre/ZdjbxxMapper.java
  32. 1 2
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/IParcelService.java
  33. 225 25
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/CadastreManageServiceImpl.java
  34. 2 2
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/ParcelServiceImpl.java
  35. 1 1
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/ConvergeServiceImpl.java
  36. 2 3
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/NodeAttachmentImpl.java
  37. 5 2
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/ProjectImpl.java
  38. 5 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/third/TakeDataService.java
  39. 1086 923
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/third/impl/DealExcelServiceImpl.java
  40. 186 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/third/impl/TakeDataServiceImpl.java
  41. 4 2
      siwei-modules/siwei-apply/src/main/resources/mapper/GyjsydscdjMapper.xml
  42. 4 2
      siwei-modules/siwei-apply/src/main/resources/mapper/JsgcghxkMapper.xml
  43. 4 2
      siwei-modules/siwei-apply/src/main/resources/mapper/JsydghxkMapper.xml
  44. 17 0
      siwei-modules/siwei-apply/src/main/resources/mapper/ProjectMapper.xml
  45. 25 2
      siwei-modules/siwei-apply/src/main/resources/mapper/TdgyMapper.xml
  46. 4 2
      siwei-modules/siwei-apply/src/main/resources/mapper/TdhyhsMapper.xml
  47. 4 2
      siwei-modules/siwei-apply/src/main/resources/mapper/TjyydhxMapper.xml
  48. 6 4
      siwei-modules/siwei-apply/src/main/resources/mapper/YdbpDataMapper.xml
  49. 4 2
      siwei-modules/siwei-apply/src/main/resources/mapper/YdbpMapper.xml
  50. 5 2
      siwei-modules/siwei-apply/src/main/resources/mapper/YdysyxzMapper.xml
  51. 40 5
      siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/CadastreFileMapper.xml
  52. 60 0
      siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/ZdbhqkMapper.xml
  53. 99 5
      siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/ZdjbxxMapper.xml

+ 6 - 6
siwei-modules/pom.xml

@@ -20,10 +20,10 @@
     </description>
 
 
-    <dependencies>
-        <dependency>
-            <groupId>com.siwei</groupId>
-            <artifactId>siwei-common-datasource</artifactId>
-        </dependency>
-    </dependencies>
+<!--    <dependencies>-->
+<!--        <dependency>-->
+<!--            <groupId>com.siwei</groupId>-->
+<!--            <artifactId>siwei-common-datasource</artifactId>-->
+<!--        </dependency>-->
+<!--    </dependencies>-->
 </project>

+ 2975 - 218
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/common/Constant.java

@@ -87,12 +87,16 @@ public class Constant {
 
 
     public static final List<String> NODE_ATTACHMENT_NAME_LIST = List.of(
+            "2016",
+            "2017",
+            "2018",
             "2019",
             "2020",
             "2021",
             "2022",
             "2023",
             "2024",
+            "2025",
             "DX2017",
             "DX2018",
             "DX2019",
@@ -105,232 +109,2985 @@ public class Constant {
     );
 
 
-    public static final List<String> BDCDYH_LIST = new ArrayList<>(Arrays.asList(
-            "360122009006GB00002W00000000",
-            "360122009006GB00159W00000000",
-            "360122009006GB00160W00000000",
-            "360122009006GB00161W00000000",
-            "360122009006GB60008W00000000",
-            "360122009006GB60107W00000000",
-            "360122009006GB60168W00000000",
-            "360122009006GB60169W00000000",
-            "360122009006GB60170W00000000",
-            "360122009006GB60171W00000000",
-            "360122009006GB60182W00000000",
-            "360122009006GB60183W00000000",
-            "360122009006GB60190W00000000",
-            "360122009006GB60242W00000000",
-            "360122009006GB60243W00000000",
-            "360122009006GB60273W00000000",
-            "360122009015GB00006W00000000",
-            "360122009015GB00013W00000000",
-            "360122009015GB00015W00000000",
-            "360122009015GB00016W00000000",
-            "360122009015GB60002W00000000",
-            "360122009015GB60053W00000000",
-            "360122009015GB60056W00000000",
-            "360122009015GB60057W00000000",
-            "360122009015GB60058W00000000",
-            "360122009015GB60059W00000000",
-            "360122009015GB60060W00000000",
-            "360122011002GB00004W00000000",
-            "360122011002GB00008W00000000",
-            "360122011002GB00013W00000000",
-            "360122011002GB00029W00000000",
-            "360122011002GB00030W00000000",
-            "360122011002GB00031W00000000",
-            "360122011002GB00308W00000000",
-            "360122011002GB60006W00000000",
-            "360122011002GB60007W00000000",
-            "360122011002GB60012W00000000",
-            "360122011002GB60013W00000000",
-            "360122011003GB00077W00000000",
-            "360122011003GB00246W00000000",
-            "360122011003GB00332W00000000",
-            "360122011003GB00333W00000000",
-            "360122011003GB00334W00000000",
-            "360122011003GB00335W00000000",
-            "360122011003GB00486W00000000",
-            "360122011004GB00381W00000000",
-            "360122011004GB00383W00000000",
-            "360122011004GB00389W00000000",
-            "360122011004GB00391W00000000",
-            "360122011004GB00392W00000000",
-            "360122011004GB00393W00000000",
-            "360122011004GB00394W00000000",
-            "360122011004GB00395W00000000",
-            "360122011004GB00418W00000000",
-            "360122011004GB00419W00000000",
-            "360122011004GB00533W00000000",
-            "360122011004GB00534W00000000",
-            "360122011005GB00002W00000000",
-            "360122011005GB00003W00000000",
-            "360122011005GB60002W00000000",
-            "360122011005GB60003W00000000",
-            "360122011005GB60005W00000000",
-            "360122011005GB60006W00000000",
-            "360122011006GB00001W00000000",
-            "360122011006GB00002W00000000",
-            "360122011006GB00007W00000000",
-            "360122011006GB00008W00000000",
-            "360122011006GB00009W00000000",
-            "360122011006GB00319W00000000",
-            "360122011006GB00320W00000000",
-            "360122011007GB00002W00000000",
-            "360122011007GB00005W00000000",
-            "360122011007GB00009W00000000",
-            "360122011007GB00016W00000000",
-            "360122011007GB00310W00000000",
-            "360122011007GB00324W00000000",
-            "360122011007GB00333W00000000",
-            "360122011007GB00336W00000000",
-            "360122011007GB00337W00000000",
-            "360122011007GB00338W00000000",
-            "360122011007GB00340W00000000",
-            "360122011007GB00341W00000000",
-            "360122011009GB00334W00000000",
-            "360122011009GB00335W00000000",
-            "360122011010GB00018W00000000",
-            "360122011010GB00021W00000000",
-            "360122011010GB00308W00000000",
-            "360122011010GB00312W00000000",
-            "360122011010GB00318W00000000",
-            "360122011010GB00319W00000000",
-            "360122011010GB60011W00000000",
-            "360122013029GB60001W00000000",
-            "360122014003GB00011W00000000",
-            "360122014003GB00045W00000000",
-            "360122014003GB00115W00000000",
-            "360122014003GB60001W00000000",
-            "360122014003GB60002W00000000",
-            "360122014003GB60003W00000000",
-            "360122014003GB60014W00000000",
-            "360122014003GB62229W00000000",
-            "360122014003GB62230W00000000",
-            "360122014003GB62231W00000000",
-            "360122014003GB62232W00000000",
-            "360122014003GB62233W00000000",
-            "360122014003GB62234W00000000",
-            "360122014003GB62235W00000000",
-            "360122014003GB62236W00000000",
-            "360122014003GB62237W00000000",
-            "360122014003GB62238W00000000",
-            "360122014003GB62243W00000000",
-            "360122014003GB62270W00000000",
-            "360122014003GB62277W00000000",
-            "360122014003GB62280W00000000",
-            "360122014003GB62302W00000000",
-            "360122014003GB62305W00000000",
-            "360122014003GB62306W00000000",
-            "360122014003GB62307W00000000",
-            "360122014003GB62309W00000000",
-            "360122014003GB62310W00000000",
-            "360122014003GB62317W00000000",
-            "360122014003GB62328W00000000",
-            "360122014003GB62340W00000000",
-            "360122014003GB62341W00000000",
-            "360122014003GB62360W00000000",
-            "360122014003GB62361W00000000",
-            "360122014003GB62362W00000000",
-            "360122014003GB62367W00000000",
-            "360122014003GB62368W00000000",
-            "360122014004GB00071W00000000",
-            "360122014004GB00072W00000000",
-            "360122014004GB00073W00000000",
-            "360122014004GB00074W00000000",
-            "360122014004GB00075W00000000",
-            "360122014004GB00076W00000000",
-            "360122014004GB00077W00000000",
-            "360122014004GB00078W00000000",
-            "360122014004GB00079W00000000",
-            "360122014004GB00081W00000000",
-            "360122014004GB00083W00000000",
-            "360122014004GB00084W00000000",
-            "360122014004GB00085W00000000",
-            "360122014004GB00086W00000000",
-            "360122014004GB00087W00000000",
-            "360122014004GB00088W00000000",
-            "360122014004GB00089W00000000",
-            "360122014004GB00090W00000000",
-            "360122014004GB00092W00000000",
-            "360122014004GB00094W00000000",
-            "360122014004GB00098W00000000",
-            "360122014004GB00099W00000000",
-            "360122014004GB00104W00000000",
-            "360122014004GB00105W00000000",
-            "360122014004GB00106W00000000",
-            "360122014004GB00107W00000000",
-            "360122014004GB00108W00000000",
-            "360122014004GB00109W00000000",
-            "360122014004GB00110W00000000",
-            "360122014004GB00111W00000000",
-            "360122014004GB00113W00000000",
-            "360122014004GB00114W00000000",
-            "360122014004GB00121W00000000",
-            "360122014004GB00128W00000000",
-            "360122014004GB00129W00000000",
-            "360122014004GB60001W00000000",
-            "360122014004GB60006W00000000",
-            "360122014004GB60017W00000000",
-            "360122014004GB60018W00000000",
-            "360122014004GB60024W00000000",
-            "360122014004GB60035W00000000",
-            "360122014005GB00044W00000000",
-            "360122014005GB00046W00000000",
-            "360122014005GB00047W00000000",
-            "360122014005GB00048W00000000",
-            "360122014005GB00050W00000000",
-            "360122014005GB60001W00000000",
-            "360122014005GB60012W00000000",
-            "360122014008GB00050W00000000",
-            "360122015001GB60001W00000000",
-            "360122015001GB60010W00000000",
-            "360122015001GB60011W00000000",
-            "360122015001GB60012W00000000",
-            "360122015001GB60013W00000000",
-            "360122015001GB60014W00000000",
-            "360122015001GB70001W00000000",
-            "360122015001GB70002W00000000",
-            "360122015002GB00001W00000000",
-            "360122015002GB00002W00000000",
-            "360122015002GB00003W00000000",
-            "360122015002GB00005W00000000",
-            "360122015002GB00019W00000000",
-            "360122015002GB00020W00000000",
-            "360122015002GB00021W00000000",
-            "360122015002GB00022W00000000",
-            "360122015002GB00023W00000000",
-            "360122015002GB00024W00000000",
-            "360122015002GB00025W00000000",
-            "360122015003GB00003W00000000",
-            "360122015003GB00004W00000000",
-            "360122015003GB00005W00000000",
-            "360122020005GB00137W00000000",
-            "360122999000GB60002W00000000",
-            "360425001012GB00027W00000000",
-            "360425005005GB60001W00000000",
-            "360425005005GB60003W00000000",
-            "360425005005GB60005W00000000",
-            "360425005005GB60006W00000000",
-            "360425005005GB60007W00000000",
-            "360425005005GB60008W00000000",
-            "360425005005GB60009W00000000",
-            "360425005005GB60014W00000000",
-            "360425005005GB60015W00000000",
-            "360425005005GB60017W00000000"
-    ));
-
-
+    public static final List<String> BDCDYH_LIST = new ArrayList<>(Arrays.asList("0", "1", "2", "3", "4", "5", "6", "7", "8", "9"));
 
 
     //项目excel导入路径
     //public static final String  IMPORT_EXCEL_DATA_FILE_PATH = "D:\\one_code_manage\\project_excel_data";
-    public static final String  IMPORT_EXCEL_DATA_FILE_PATH = "D:\\tmp\\one_code_manage\\excel_deom";
+    //public static final String  IMPORT_EXCEL_DATA_FILE_PATH = "D:\\tmp\\one_code_manage\\excel_deom";
+    public static final String  IMPORT_EXCEL_DATA_FILE_PATH = "D:\\tmp\\one_code_manage\\excel_full_deal";
+
+    public static final String  IMPORT_EXCEL_FILE_PATH = "D:\\tmp\\给开发";
 
-    public static final String  FILE_UPLOAD_PATH = "/home/siwei/uploadPath/2026/06/07";
+
+    public static final String  FILE_UPLOAD_PATH = "/home/siwei/uploadPath/2026/09/33";
 
     public static final String  GG = "GONGGAI";
     public static final String  BDC = "BUDONGCHAN";
     public static final String  BDC_FILE_DOWN_PATH = "C:\\Users\\Administrator\\Desktop\\11\\excel_out\\output\\02";
 
+
+    public static final String BATCH_NODE_ATTACHMENT_NAME = "D:\\tmp\\one_code_manage\\excel_full_deal\\附件材料-批次报批用地";
+
+
+
+    public static final List<String>   BDC_HOUSE_LIST = List.of(
+            "360122014005GB00046F00110047",
+            "360122011007GB00322F99960001",
+            "360122011007GB00322F99990001",
+            "360122011007GB00322F99980001",
+            "360122011007GB00322F99950001",
+            "360122011007GB00322F99970001",
+            "360122014004GB00072F00070008",
+            "360122014004GB00072F00070009",
+            "360122014004GB00072F00070007",
+            "360122014004GB00072F00070006",
+            "360122014004GB00072F00070005",
+            "360122014004GB00072F00070004",
+            "360122014004GB00072F00070003",
+            "360122014004GB00072F00070001",
+            "360122014004GB00072F00070002",
+            "360122011003GB00334F00300033",
+            "360122014003GB62302F00090005",
+            "360122009006GB60008F99950001",
+            "360122014004GB00090F00030075",
+            "360122014005GB00046F00070013",
+            "360122014004GB00087F00060009",
+            "360122014004GB00087F00060023",
+            "360122014004GB00107F00080013",
+            "360122014003GB62303F00030086",
+            "360122011003GB00333F00650002",
+            "360122014004GB00091F00090025",
+            "360122014004GB00107F00080017",
+            "360122014004GB00087F00050027",
+            "360122014004GB00087F00050053",
+            "360122011003GB00328F00030019",
+            "360122014004GB00087F00070045",
+            "360122014004GB00091F00020058",
+            "360122014004GB00090F00040029",
+            "360122014004GB00090F00060026",
+            "360122014005GB00046F00110047",
+            "360122014005GB00046F00110072",
+            "360122014005GB00046F00110056",
+            "360122014005GB00046F00110058",
+            "360122014005GB00046F00110080",
+            "360122014005GB00046F00110040",
+            "360122011003GB00328F00060022",
+            "360122011003GB00333F00720034",
+            "360122014005GB00046F00050058",
+            "360122011004GB00385F00060018",
+            "360122011004GB00385F00060016",
+            "360122011004GB00385F00060014",
+            "360122011004GB00385F00060039",
+            "360122011004GB00385F00060015",
+            "360122011004GB00385F00130039",
+            "360122011004GB00385F00130044",
+            "360122011004GB00385F00130020",
+            "360122011004GB00385F00130014",
+            "360122011004GB00385F00130034",
+            "360122011004GB00385F00130008",
+            "360122011004GB00385F00130031",
+            "360122011004GB00385F00140002",
+            "360122011004GB00385F00090042",
+            "360122011004GB00385F00020033",
+            "360122011004GB00385F00020002",
+            "360122011004GB00385F00020007",
+            "360122011004GB00385F00020029",
+            "360122011004GB00385F00020024",
+            "360122011004GB00385F00020018",
+            "360122011004GB00385F00100018",
+            "360122011004GB00385F00100031",
+            "360122011004GB00385F00100015",
+            "360122014004GB00105F00070039",
+            "360122014004GB00105F00100060",
+            "360122014004GB00105F00090050",
+            "360122014004GB00105F00090080",
+            "360122014004GB00105F00090019",
+            "360122014004GB00105F00090047",
+            "360122014004GB00105F00130001",
+            "360122014004GB00105F00130002",
+            "360122014004GB00105F00130003",
+            "360122014004GB00105F00130004",
+            "360122014004GB00105F00130005",
+            "360122014004GB00105F00130006",
+            "360122014004GB00105F00130013",
+            "360122014004GB00105F00130012",
+            "360122014004GB00105F00130007",
+            "360122014004GB00105F00130011",
+            "360122014004GB00105F00130010",
+            "360122014004GB00091F00020037",
+            "360122014004GB00107F00050002",
+            "360122014005GB00046F00080003",
+            "360122014005GB00046F00070007",
+            "360122014005GB00046F00090009",
+            "360122014005GB00046F00050061",
+            "360122014004GB00086F00030019",
+            "360122014004GB00107F00080018",
+            "360122014004GB00087F00030002",
+            "360122014004GB00087F00010002",
+            "360122014005GB00046F00050041",
+            "360122011003GB00328F00030009",
+            "360122011001GB00313F00010032",
+            "360122014004GB00090F00030008",
+            "360122014004GB00090F00030004",
+            "360122011003GB00334F00230036",
+            "360122014003GB62303F00030083",
+            "360122014003GB62303F00010044",
+            "360122014003GB62303F00030062",
+            "360122014003GB62303F00050024",
+            "360122014003GB62303F00030064",
+            "360122014003GB62303F00030020",
+            "360122011003GB00334F00270006",
+            "360122011006GB00010F00010038",
+            "360122014004GB00107F00140002",
+            "360122014004GB00107F00140001",
+            "360122014004GB00107F00140005",
+            "360122014004GB00107F00140006",
+            "360122014004GB00107F00140007",
+            "360122014004GB00107F00140010",
+            "360122014004GB00107F00140011",
+            "360122014004GB00107F00140012",
+            "360122014004GB00107F00140013",
+            "360122014004GB00107F00140015",
+            "360122014004GB00107F00140018",
+            "360122014004GB00107F00140020",
+            "360122014004GB00107F00140022",
+            "360122014004GB00107F00140023",
+            "360122014004GB00107F00140024",
+            "360122014004GB00107F00140021",
+            "360122014004GB00107F00140003",
+            "360122014004GB00107F00130011",
+            "360122014004GB00107F00130010",
+            "360122014004GB00107F00130012",
+            "360122014003GB62302F00060013",
+            "360122011004GB00357F00200021",
+            "360122011004GB00378F00060008",
+            "360122011009GB00321F99960001",
+            "360122014005GB00046F00050094",
+            "360122011004GB00357F00260026",
+            "360122014003GB62303F00060009",
+            "360122014004GB00107F00060006",
+            "360122014004GB00107F00060016",
+            "360122014004GB00107F00060003",
+            "360122014004GB00107F00080011",
+            "360122014004GB00107F00090003",
+            "360122014004GB00107F00090007",
+            "360122014004GB00107F00090018",
+            "360122014004GB00107F00090008",
+            "360122014004GB00107F00120002",
+            "360122014004GB00107F00120009",
+            "360122014004GB00107F00120007",
+            "360122014004GB00107F00120018",
+            "360122014004GB00107F00120016",
+            "360122014004GB00107F00120021",
+            "360122014004GB00107F00120023",
+            "360122014004GB00107F00120024",
+            "360122014004GB00107F00120003",
+            "360122014004GB00107F00100002",
+            "360122014004GB00107F00100006",
+            "360122014004GB00107F00100013",
+            "360122014004GB00107F00100032",
+            "360122014004GB00107F00100031",
+            "360122014004GB00107F00100029",
+            "360122014004GB00107F00100011",
+            "360122014004GB00107F00100035",
+            "360122014004GB00107F00100036",
+            "360122014004GB00107F00100016",
+            "360122014004GB00107F00100015",
+            "360122014004GB00107F00100010",
+            "360122014004GB00107F00100014",
+            "360122014004GB00107F00100009",
+            "360122014004GB00107F00100033",
+            "360122014004GB00107F00100007",
+            "360122014004GB00107F00100012",
+            "360122014004GB00107F00050016",
+            "360122014004GB00107F00050019",
+            "360122014004GB00107F00050013",
+            "360122014004GB00107F00050012",
+            "360122014004GB00107F00050029",
+            "360122014004GB00107F00050010",
+            "360122014004GB00107F00050036",
+            "360122014004GB00107F00050035",
+            "360122014004GB00107F00050031",
+            "360122014004GB00107F00050007",
+            "360122014004GB00107F00070010",
+            "360122014004GB00107F00070025",
+            "360122014004GB00107F00070017",
+            "360122014004GB00107F00070014",
+            "360122014004GB00107F00070018",
+            "360122014004GB00107F00070022",
+            "360122014004GB00107F00070021",
+            "360122014004GB00107F00070035",
+            "360122014004GB00107F00110011",
+            "360122014004GB00107F00110012",
+            "360122014004GB00107F00110009",
+            "360122014004GB00107F00110007",
+            "360122014004GB00107F00110001",
+            "360122011002GB60001F99930001",
+            "360122011002GB60001F99990001",
+            "360122011002GB60001F99910001",
+            "360122011002GB60001F99960001",
+            "360122011002GB60001F99920001",
+            "360122011002GB60001F99940001",
+            "360122011002GB60001F99970001",
+            "360122011002GB60001F99980001",
+            "360122011002GB60001F99950001",
+            "360122011009GB00321F99970001",
+            "360122011001GB00313F00010038",
+            "360122014004GB00105F00030002",
+            "360122011006GB00305F00360044",
+            "360122011003GB00332F00010017",
+            "360122014005GB00046F00090005",
+            "360122014005GB00046F00090006",
+            "360122014005GB00046F00090008",
+            "360122014005GB00046F00090002",
+            "360122014005GB00046F00090013",
+            "360122014005GB00046F00090014",
+            "360122014005GB00046F00090001",
+            "360122014005GB00046F00090012",
+            "360122014005GB00046F00090010",
+            "360122011006GB00010F00120061",
+            "360122014004GB00087F00070034",
+            "360122011003GB00335F00290027",
+            "360122014004GB00105F00040023",
+            "360122014004GB00122F00030001",
+            "360122014004GB00091F00030010",
+            "360122014004GB00087F00010020",
+            "360122014004GB00091F00090022",
+            "360122011006GB00010F00130107",
+            "360122011006GB00010F00130104",
+            "360122011006GB00010F00130105",
+            "360122011006GB00010F00130071",
+            "360122011006GB00010F00130069",
+            "360122011006GB00010F00130064",
+            "360122011006GB00010F00130033",
+            "360122011006GB00010F00130028",
+            "360122011006GB00010F00130059",
+            "360122011006GB00010F00130025",
+            "360122011006GB00010F00130023",
+            "360122011006GB00010F00130027",
+            "360122011006GB00010F00130013",
+            "360122011006GB00010F00100009",
+            "360122011006GB00010F00070025",
+            "360122011006GB00010F00040052",
+            "360122011006GB00010F00020049",
+            "360122011006GB00010F00020021",
+            "360122011006GB00010F00030035",
+            "360122011006GB00010F00030002",
+            "360122011006GB00010F00010025",
+            "360122011006GB00010F00040078",
+            "360122014005GB00045F00100021",
+            "360122014004GB00086F00060020",
+            "360122014004GB00086F00070019",
+            "360122014003GB62302F00030101",
+            "360122011004GB00357F00100024",
+            "360122014005GB00046F00050066",
+            "360122014005GB00046F00050091",
+            "360122014005GB00046F00050068",
+            "360122014005GB00046F00050090",
+            "360122014004GB00093F00030080",
+            "360122014004GB00093F00030081",
+            "360122014004GB00093F00030082",
+            "360122014004GB00093F00030083",
+            "360122014004GB00093F00030084",
+            "360122014004GB00093F00030085",
+            "360122014004GB00093F00030087",
+            "360122014004GB00093F00030088",
+            "360122014004GB00093F00030089",
+            "360122014004GB00093F00030090",
+            "360122014004GB00093F00030092",
+            "360122014004GB00093F00030093",
+            "360122014004GB00093F00030094",
+            "360122014004GB00093F00030095",
+            "360122014004GB00093F00030096",
+            "360122014004GB00093F00030097",
+            "360122014004GB00093F00030098",
+            "360122014004GB00093F00030099",
+            "360122014004GB00093F00030100",
+            "360122014004GB00093F00030101",
+            "360122014004GB00093F00030102",
+            "360122014004GB00093F00030103",
+            "360122014004GB00093F00030104",
+            "360122014004GB00093F00030105",
+            "360122014004GB00093F00030003",
+            "360122014004GB00093F00030036",
+            "360122014004GB00093F00030037",
+            "360122014004GB00093F00030028",
+            "360122014004GB00093F00030029",
+            "360122014004GB00093F00030033",
+            "360122014004GB00093F00030026",
+            "360122014004GB00093F00030034",
+            "360122014004GB00093F00030035",
+            "360122014004GB00093F00030030",
+            "360122014004GB00093F00030031",
+            "360122014004GB00093F00030032",
+            "360122014004GB00093F00030038",
+            "360122014004GB00093F00030039",
+            "360122014004GB00093F00030040",
+            "360122014004GB00093F00030004",
+            "360122014004GB00093F00030001",
+            "360122014004GB00093F00030002",
+            "360122014004GB00093F00030005",
+            "360122014004GB00093F00030006",
+            "360122014004GB00093F00030007",
+            "360122014004GB00093F00030008",
+            "360122014004GB00093F00030009",
+            "360122014004GB00093F00030010",
+            "360122014004GB00093F00030011",
+            "360122014004GB00093F00030012",
+            "360122014004GB00093F00030013",
+            "360122014004GB00093F00030014",
+            "360122014004GB00093F00030015",
+            "360122014004GB00093F00030016",
+            "360122014004GB00093F00030017",
+            "360122014004GB00093F00030018",
+            "360122014004GB00093F00030019",
+            "360122014004GB00093F00030020",
+            "360122014004GB00093F00030021",
+            "360122014004GB00093F00030022",
+            "360122014004GB00093F00030023",
+            "360122014004GB00093F00030024",
+            "360122014004GB00093F00030025",
+            "360122014004GB00093F00030027",
+            "360122014004GB00093F00030041",
+            "360122014004GB00093F00030042",
+            "360122014004GB00093F00030043",
+            "360122014004GB00093F00030044",
+            "360122014004GB00093F00030045",
+            "360122014004GB00093F00030046",
+            "360122014004GB00093F00030047",
+            "360122014004GB00093F00030048",
+            "360122014004GB00093F00030049",
+            "360122014004GB00093F00030050",
+            "360122014004GB00093F00030051",
+            "360122014004GB00093F00030052",
+            "360122014004GB00093F00030053",
+            "360122014004GB00093F00030054",
+            "360122014004GB00093F00030055",
+            "360122014004GB00093F00030056",
+            "360122014004GB00093F00030057",
+            "360122014004GB00093F00030058",
+            "360122014004GB00093F00030059",
+            "360122014004GB00093F00030060",
+            "360122014004GB00093F00030061",
+            "360122014004GB00093F00030062",
+            "360122014004GB00093F00030063",
+            "360122014004GB00093F00030064",
+            "360122014004GB00093F00030065",
+            "360122014004GB00093F00030066",
+            "360122014004GB00093F00030067",
+            "360122014004GB00093F00030068",
+            "360122014004GB00093F00030069",
+            "360122014004GB00093F00030070",
+            "360122014004GB00093F00030071",
+            "360122014004GB00093F00030072",
+            "360122014004GB00093F00030073",
+            "360122014004GB00093F00030074",
+            "360122014004GB00093F00030075",
+            "360122014004GB00093F00030076",
+            "360122014004GB00093F00030077",
+            "360122014004GB00093F00030078",
+            "360122014004GB00093F00030079",
+            "360122014004GB00080F00010483",
+            "360122014004GB00080F00010482",
+            "360122014004GB00080F00010441",
+            "360122014004GB00080F00010440",
+            "360122014004GB00093F00010041",
+            "360122014004GB00093F00010046",
+            "360122014004GB00093F00010051",
+            "360122014004GB00093F00010052",
+            "360122014004GB00093F00010053",
+            "360122014004GB00093F00010054",
+            "360122014004GB00093F00010003",
+            "360122014004GB00093F00010004",
+            "360122014004GB00093F00010103",
+            "360122014004GB00093F00010104",
+            "360122014004GB00093F00010109",
+            "360122014004GB00093F00010132",
+            "360122014004GB00093F00010133",
+            "360122014004GB00093F00010009",
+            "360122014004GB00093F00010010",
+            "360122014004GB00093F00010011",
+            "360122014004GB00093F00010012",
+            "360122014004GB00093F00010013",
+            "360122014004GB00093F00010014",
+            "360122014004GB00093F00010128",
+            "360122014004GB00093F00010015",
+            "360122014004GB00093F00010083",
+            "360122014004GB00093F00010084",
+            "360122014004GB00093F00010085",
+            "360122014004GB00093F00010086",
+            "360122014004GB00093F00010089",
+            "360122014004GB00093F00010090",
+            "360122014004GB00093F00010001",
+            "360122014004GB00093F00010002",
+            "360122014004GB00093F00010093",
+            "360122014004GB00093F00010091",
+            "360122014004GB00093F00010094",
+            "360122014004GB00093F00010095",
+            "360122014004GB00093F00010096",
+            "360122014004GB00093F00010097",
+            "360122014004GB00093F00010110",
+            "360122014004GB00093F00010058",
+            "360122014004GB00093F00010059",
+            "360122014004GB00093F00010060",
+            "360122014004GB00093F00010061",
+            "360122014004GB00093F00010062",
+            "360122014004GB00093F00010063",
+            "360122014004GB00093F00010064",
+            "360122014004GB00093F00010065",
+            "360122014004GB00093F00010066",
+            "360122014004GB00093F00010005",
+            "360122014004GB00093F00010006",
+            "360122014004GB00093F00010043",
+            "360122014004GB00093F00010044",
+            "360122014004GB00093F00010045",
+            "360122014004GB00093F00010040",
+            "360122014004GB00093F00010112",
+            "360122014004GB00093F00010067",
+            "360122014004GB00093F00010068",
+            "360122014004GB00093F00010069",
+            "360122014004GB00093F00010087",
+            "360122014004GB00093F00010088",
+            "360122014004GB00093F00010070",
+            "360122014004GB00093F00010071",
+            "360122014004GB00093F00010072",
+            "360122014004GB00093F00010073",
+            "360122014004GB00093F00010074",
+            "360122014004GB00093F00010075",
+            "360122014004GB00093F00010113",
+            "360122014004GB00093F00010114",
+            "360122014004GB00093F00010115",
+            "360122014004GB00093F00010116",
+            "360122014004GB00093F00010134",
+            "360122014004GB00093F00010135",
+            "360122014004GB00093F00010117",
+            "360122014004GB00093F00010118",
+            "360122014004GB00093F00010119",
+            "360122014004GB00093F00010120",
+            "360122014004GB00093F00010111",
+            "360122014004GB00093F00010076",
+            "360122014004GB00093F00010077",
+            "360122014004GB00093F00010078",
+            "360122014004GB00093F00010079",
+            "360122014004GB00093F00010121",
+            "360122014004GB00093F00010122",
+            "360122014004GB00093F00010123",
+            "360122014004GB00093F00010124",
+            "360122014004GB00093F00010125",
+            "360122014004GB00093F00010126",
+            "360122014004GB00093F00010127",
+            "360122014004GB00093F00010129",
+            "360122014004GB00093F00010130",
+            "360122014004GB00093F00010131",
+            "360122014004GB00093F00010018",
+            "360122014004GB00093F00010019",
+            "360122014004GB00093F00010020",
+            "360122014004GB00093F00010021",
+            "360122014004GB00093F00010022",
+            "360122014004GB00093F00010023",
+            "360122014004GB00093F00010024",
+            "360122014004GB00093F00010025",
+            "360122014004GB00093F00010026",
+            "360122014004GB00093F00010032",
+            "360122014004GB00093F00010033",
+            "360122014004GB00093F00010034",
+            "360122014004GB00093F00010035",
+            "360122014004GB00093F00010036",
+            "360122014004GB00093F00010027",
+            "360122014004GB00093F00010028",
+            "360122014004GB00093F00010029",
+            "360122014004GB00093F00010030",
+            "360122014004GB00093F00010031",
+            "360122014004GB00093F00010055",
+            "360122014004GB00093F00010047",
+            "360122014004GB00093F00010056",
+            "360122014004GB00093F00010057",
+            "360122014004GB00093F00010105",
+            "360122014004GB00093F00010106",
+            "360122014004GB00093F00010107",
+            "360122014004GB00093F00010108",
+            "360122014004GB00093F00010037",
+            "360122014004GB00093F00010038",
+            "360122014004GB00093F00010039",
+            "360122014004GB00093F00010080",
+            "360122014004GB00093F00010081",
+            "360122014004GB00093F00010082",
+            "360122014004GB00093F00010098",
+            "360122014004GB00093F00010099",
+            "360122014004GB00093F00010100",
+            "360122014004GB00093F00010101",
+            "360122014004GB00093F00010092",
+            "360122014004GB00093F00010102",
+            "360122014004GB00093F00010048",
+            "360122014004GB00093F00010049",
+            "360122014004GB00093F00010050",
+            "360122014004GB00093F00010042",
+            "360122014004GB00093F00010007",
+            "360122014004GB00093F00010016",
+            "360122014004GB00093F00010017",
+            "360122014004GB00093F00010008",
+            "360122014004GB00093F00050021",
+            "360122014004GB00093F00050020",
+            "360122014004GB00093F00050023",
+            "360122014004GB00093F00050024",
+            "360122014004GB00093F00050028",
+            "360122014004GB00093F00050030",
+            "360122014004GB00093F00050019",
+            "360122014004GB00093F00050032",
+            "360122014004GB00093F00050034",
+            "360122014004GB00093F00050035",
+            "360122014004GB00093F00050036",
+            "360122014004GB00093F00050037",
+            "360122014004GB00093F00050039",
+            "360122014004GB00093F00050003",
+            "360122014004GB00093F00050004",
+            "360122014004GB00093F00050040",
+            "360122014004GB00093F00050001",
+            "360122014004GB00093F00050038",
+            "360122014004GB00093F00050002",
+            "360122014004GB00093F00050005",
+            "360122014004GB00093F00050006",
+            "360122014004GB00093F00050007",
+            "360122014004GB00093F00050008",
+            "360122014004GB00093F00050010",
+            "360122014004GB00093F00050009",
+            "360122014004GB00093F00050026",
+            "360122014004GB00093F00050027",
+            "360122014004GB00093F00050017",
+            "360122014004GB00093F00050016",
+            "360122014004GB00093F00050018",
+            "360122014004GB00093F00050011",
+            "360122014004GB00093F00050031",
+            "360122014004GB00093F00050012",
+            "360122014004GB00093F00050013",
+            "360122014004GB00093F00050014",
+            "360122014004GB00093F00050015",
+            "360122014004GB00093F00050022",
+            "360122014004GB00093F00070005",
+            "360122014004GB00093F00070018",
+            "360122014004GB00093F00070039",
+            "360122014004GB00093F00070032",
+            "360122014004GB00093F00070026",
+            "360122014004GB00093F00070038",
+            "360122014004GB00093F00070037",
+            "360122014004GB00093F00070034",
+            "360122014004GB00093F00070033",
+            "360122014004GB00093F00070003",
+            "360122014004GB00093F00070002",
+            "360122014004GB00093F00070024",
+            "360122014004GB00093F00070007",
+            "360122014004GB00093F00070006",
+            "360122014004GB00093F00070028",
+            "360122014004GB00093F00070010",
+            "360122014004GB00093F00070016",
+            "360122014004GB00093F00070014",
+            "360122014004GB00093F00070029",
+            "360122014004GB00093F00070015",
+            "360122014004GB00093F00070009",
+            "360122014004GB00093F00070036",
+            "360122014004GB00093F00070027",
+            "360122014004GB00093F00070020",
+            "360122014004GB00093F00070017",
+            "360122014004GB00093F00070004",
+            "360122014004GB00093F00070025",
+            "360122014004GB00093F00070008",
+            "360122014004GB00093F00070001",
+            "360122014004GB00093F00070019",
+            "360122014004GB00093F00070040",
+            "360122014004GB00093F00070021",
+            "360122014004GB00093F00070022",
+            "360122014004GB00093F00070023",
+            "360122014004GB00093F00070012",
+            "360122014004GB00093F00070030",
+            "360122014004GB00093F00070011",
+            "360122014004GB00093F00070013",
+            "360122014004GB00093F00070031",
+            "360122014004GB00093F00070035",
+            "360122014004GB00093F00080012",
+            "360122014004GB00093F00080018",
+            "360122014004GB00093F00080002",
+            "360122014004GB00093F00080009",
+            "360122014004GB00093F00080011",
+            "360122014004GB00093F00080010",
+            "360122014004GB00093F00080001",
+            "360122014004GB00093F00080007",
+            "360122014004GB00093F00080006",
+            "360122014004GB00093F00080005",
+            "360122014004GB00093F00080004",
+            "360122014004GB00093F00080020",
+            "360122014004GB00093F00080013",
+            "360122014004GB00093F00080019",
+            "360122014004GB00093F00080017",
+            "360122014004GB00093F00080016",
+            "360122014004GB00093F00080015",
+            "360122014004GB00093F00080014",
+            "360122014004GB00093F00080022",
+            "360122014004GB00093F00080021",
+            "360122014004GB00093F00080008",
+            "360122014004GB00093F00080003",
+            "360122014004GB00093F00040078",
+            "360122014004GB00093F00040079",
+            "360122014004GB00093F00040080",
+            "360122014004GB00093F00040081",
+            "360122014004GB00093F00040082",
+            "360122014004GB00093F00040083",
+            "360122014004GB00093F00040084",
+            "360122014004GB00093F00040085",
+            "360122014004GB00093F00040001",
+            "360122014004GB00093F00040004",
+            "360122014004GB00093F00040086",
+            "360122014004GB00093F00040077",
+            "360122014004GB00093F00040038",
+            "360122014004GB00093F00040039",
+            "360122014004GB00093F00040040",
+            "360122014004GB00093F00040041",
+            "360122014004GB00093F00040042",
+            "360122014004GB00093F00040043",
+            "360122014004GB00093F00040044",
+            "360122014004GB00093F00040045",
+            "360122014004GB00093F00040052",
+            "360122014004GB00093F00040048",
+            "360122014004GB00093F00040055",
+            "360122014004GB00093F00040056",
+            "360122014004GB00093F00040068",
+            "360122014004GB00093F00040069",
+            "360122014004GB00093F00040070",
+            "360122014004GB00093F00040071",
+            "360122014004GB00093F00040072",
+            "360122014004GB00093F00040047",
+            "360122014004GB00093F00040049",
+            "360122014004GB00093F00040050",
+            "360122014004GB00093F00040093",
+            "360122014004GB00093F00040104",
+            "360122014004GB00093F00040105",
+            "360122014004GB00093F00040106",
+            "360122014004GB00093F00040109",
+            "360122014004GB00093F00040110",
+            "360122014004GB00093F00040014",
+            "360122014004GB00093F00040023",
+            "360122014004GB00093F00040024",
+            "360122014004GB00093F00040025",
+            "360122014004GB00093F00040015",
+            "360122014004GB00093F00040016",
+            "360122014004GB00093F00040017",
+            "360122014004GB00093F00040018",
+            "360122014004GB00093F00040019",
+            "360122014004GB00093F00040020",
+            "360122014004GB00093F00040021",
+            "360122014004GB00093F00040022",
+            "360122014004GB00093F00040013",
+            "360122014004GB00093F00040026",
+            "360122014004GB00093F00040027",
+            "360122014004GB00093F00040028",
+            "360122014004GB00093F00040029",
+            "360122014004GB00093F00040030",
+            "360122014004GB00093F00040031",
+            "360122014004GB00093F00040032",
+            "360122014004GB00093F00040058",
+            "360122014004GB00093F00040046",
+            "360122014004GB00093F00040033",
+            "360122014004GB00093F00040034",
+            "360122014004GB00093F00040035",
+            "360122014004GB00093F00040036",
+            "360122014004GB00093F00040037",
+            "360122014004GB00093F00040007",
+            "360122014004GB00093F00040008",
+            "360122014004GB00093F00040002",
+            "360122014004GB00093F00040009",
+            "360122014004GB00093F00040095",
+            "360122014004GB00093F00040010",
+            "360122014004GB00093F00040011",
+            "360122014004GB00093F00040012",
+            "360122014004GB00093F00040053",
+            "360122014004GB00093F00040054",
+            "360122014004GB00093F00040094",
+            "360122014004GB00093F00040051",
+            "360122014004GB00093F00040059",
+            "360122014004GB00093F00040060",
+            "360122014004GB00093F00040061",
+            "360122014004GB00093F00040057",
+            "360122014004GB00093F00040096",
+            "360122014004GB00093F00040097",
+            "360122014004GB00093F00040098",
+            "360122014004GB00093F00040099",
+            "360122014004GB00093F00040100",
+            "360122014004GB00093F00040101",
+            "360122014004GB00093F00040102",
+            "360122014004GB00093F00040103",
+            "360122014004GB00093F00040062",
+            "360122014004GB00093F00040063",
+            "360122014004GB00093F00040064",
+            "360122014004GB00093F00040065",
+            "360122014004GB00093F00040066",
+            "360122014004GB00093F00040067",
+            "360122014004GB00093F00040073",
+            "360122014004GB00093F00040074",
+            "360122014004GB00093F00040075",
+            "360122014004GB00093F00040087",
+            "360122014004GB00093F00040088",
+            "360122014004GB00093F00040089",
+            "360122014004GB00093F00040090",
+            "360122014004GB00093F00040091",
+            "360122014004GB00093F00040107",
+            "360122014004GB00093F00040108",
+            "360122014004GB00093F00040092",
+            "360122014004GB00093F00040003",
+            "360122014004GB00093F00040005",
+            "360122014004GB00093F00040006",
+            "360122014004GB00093F00020047",
+            "360122014004GB00093F00020049",
+            "360122014004GB00093F00020048",
+            "360122014004GB00093F00020050",
+            "360122014004GB00093F00020051",
+            "360122014004GB00093F00020052",
+            "360122014004GB00093F00020053",
+            "360122014004GB00093F00020043",
+            "360122014004GB00093F00020044",
+            "360122014004GB00093F00020054",
+            "360122014004GB00093F00020055",
+            "360122014004GB00093F00020010",
+            "360122014004GB00093F00020140",
+            "360122014004GB00093F00020011",
+            "360122014004GB00093F00020012",
+            "360122014004GB00093F00020013",
+            "360122014004GB00093F00020137",
+            "360122014004GB00093F00020138",
+            "360122014004GB00093F00020139",
+            "360122014004GB00093F00020001",
+            "360122014004GB00093F00020002",
+            "360122014004GB00093F00020027",
+            "360122014004GB00093F00020029",
+            "360122014004GB00093F00020018",
+            "360122014004GB00093F00020022",
+            "360122014004GB00093F00020134",
+            "360122014004GB00093F00020122",
+            "360122014004GB00093F00020123",
+            "360122014004GB00093F00020116",
+            "360122014004GB00093F00020126",
+            "360122014004GB00093F00020127",
+            "360122014004GB00093F00020128",
+            "360122014004GB00093F00020129",
+            "360122014004GB00093F00020039",
+            "360122014004GB00093F00020136",
+            "360122014004GB00093F00020037",
+            "360122014004GB00093F00020076",
+            "360122014004GB00093F00020077",
+            "360122014004GB00093F00020079",
+            "360122014004GB00093F00020085",
+            "360122014004GB00093F00020086",
+            "360122014004GB00093F00020068",
+            "360122014004GB00093F00020069",
+            "360122014004GB00093F00020070",
+            "360122014004GB00093F00020071",
+            "360122014004GB00093F00020078",
+            "360122014004GB00093F00020072",
+            "360122014004GB00093F00020107",
+            "360122014004GB00093F00020073",
+            "360122014004GB00093F00020074",
+            "360122014004GB00093F00020087",
+            "360122014004GB00093F00020088",
+            "360122014004GB00093F00020089",
+            "360122014004GB00093F00020090",
+            "360122014004GB00093F00020091",
+            "360122014004GB00093F00020092",
+            "360122014004GB00093F00020093",
+            "360122014004GB00093F00020094",
+            "360122014004GB00093F00020095",
+            "360122014004GB00093F00020108",
+            "360122014004GB00093F00020101",
+            "360122014004GB00093F00020102",
+            "360122014004GB00093F00020103",
+            "360122014004GB00093F00020106",
+            "360122014004GB00093F00020097",
+            "360122014004GB00093F00020109",
+            "360122014004GB00093F00020110",
+            "360122014004GB00093F00020111",
+            "360122014004GB00093F00020023",
+            "360122014004GB00093F00020024",
+            "360122014004GB00093F00020025",
+            "360122014004GB00093F00020026",
+            "360122014004GB00093F00020030",
+            "360122014004GB00093F00020028",
+            "360122014004GB00093F00020021",
+            "360122014004GB00093F00020057",
+            "360122014004GB00093F00020058",
+            "360122014004GB00093F00020067",
+            "360122014004GB00093F00020080",
+            "360122014004GB00093F00020081",
+            "360122014004GB00093F00020059",
+            "360122014004GB00093F00020060",
+            "360122014004GB00093F00020061",
+            "360122014004GB00093F00020062",
+            "360122014004GB00093F00020096",
+            "360122014004GB00093F00020016",
+            "360122014004GB00093F00020017",
+            "360122014004GB00093F00020019",
+            "360122014004GB00093F00020033",
+            "360122014004GB00093F00020034",
+            "360122014004GB00093F00020020",
+            "360122014004GB00093F00020075",
+            "360122014004GB00093F00020040",
+            "360122014004GB00093F00020041",
+            "360122014004GB00093F00020042",
+            "360122014004GB00093F00020045",
+            "360122014004GB00093F00020056",
+            "360122014004GB00093F00020046",
+            "360122014004GB00093F00020038",
+            "360122014004GB00093F00020124",
+            "360122014004GB00093F00020125",
+            "360122014004GB00093F00020130",
+            "360122014004GB00093F00020131",
+            "360122014004GB00093F00020132",
+            "360122014004GB00093F00020105",
+            "360122014004GB00093F00020064",
+            "360122014004GB00093F00020065",
+            "360122014004GB00093F00020063",
+            "360122014004GB00093F00020003",
+            "360122014004GB00093F00020004",
+            "360122014004GB00093F00020005",
+            "360122014004GB00093F00020006",
+            "360122014004GB00093F00020007",
+            "360122014004GB00093F00020008",
+            "360122014004GB00093F00020009",
+            "360122014004GB00093F00020014",
+            "360122014004GB00093F00020015",
+            "360122014004GB00093F00020031",
+            "360122014004GB00093F00020100",
+            "360122014004GB00093F00020066",
+            "360122014004GB00093F00020082",
+            "360122014004GB00093F00020083",
+            "360122014004GB00093F00020032",
+            "360122014004GB00093F00020035",
+            "360122014004GB00093F00020036",
+            "360122014004GB00093F00020098",
+            "360122014004GB00093F00020099",
+            "360122014004GB00093F00020084",
+            "360122014004GB00093F00020112",
+            "360122014004GB00093F00020113",
+            "360122014004GB00093F00020104",
+            "360122014004GB00093F00020114",
+            "360122014004GB00093F00020115",
+            "360122014004GB00093F00020117",
+            "360122014004GB00093F00020118",
+            "360122014004GB00093F00020119",
+            "360122014004GB00093F00020120",
+            "360122014004GB00093F00020121",
+            "360122014004GB00093F00020133",
+            "360122014004GB00093F00020135",
+            "360122014004GB00093F00060021",
+            "360122014004GB00093F00060020",
+            "360122014004GB00093F00060001",
+            "360122014004GB00093F00060002",
+            "360122014004GB00093F00060003",
+            "360122014004GB00093F00060004",
+            "360122014004GB00093F00060005",
+            "360122014004GB00093F00060006",
+            "360122014004GB00093F00060014",
+            "360122014004GB00093F00060007",
+            "360122014004GB00093F00060008",
+            "360122014004GB00093F00060016",
+            "360122014004GB00093F00060017",
+            "360122014004GB00093F00060018",
+            "360122014004GB00093F00060015",
+            "360122014004GB00093F00060009",
+            "360122014004GB00093F00060010",
+            "360122014004GB00093F00060011",
+            "360122014004GB00093F00060012",
+            "360122014004GB00093F00060013",
+            "360122014004GB00093F00060019",
+            "360122014004GB00093F00060022",
+            "360122014003GB62302F00020062",
+            "360122014003GB62302F00020096",
+            "360122014003GB62302F00020078",
+            "360122014003GB62302F00020007",
+            "360122014003GB62302F00030080",
+            "360122014003GB62302F00030057",
+            "360122014003GB62302F00030120",
+            "360122014003GB62302F00030086",
+            "360122014003GB62302F00030105",
+            "360122014003GB62302F00030111",
+            "360122014003GB62302F00070026",
+            "360122014003GB62302F00070076",
+            "360122014003GB62302F00070002",
+            "360122014003GB62302F00070004",
+            "360122014003GB62302F00060106",
+            "360122014003GB62302F00060088",
+            "360122014003GB62302F00060070",
+            "360122014003GB62302F00060051",
+            "360122014003GB62302F00050037",
+            "360122014003GB62302F00050018",
+            "360122014003GB62302F00050009",
+            "360122014003GB62302F00050086",
+            "360122014003GB62302F00050046",
+            "360122014003GB62302F00080006",
+            "360122014003GB62302F00010049",
+            "360122014003GB62302F00010048",
+            "360122014003GB62302F00010076",
+            "360122014003GB62302F00100090",
+            "360122014003GB62302F00100098",
+            "360122014003GB62302F00100081",
+            "360122014003GB62302F00100115",
+            "360122014003GB62302F00100054",
+            "360122014003GB62302F00090032",
+            "360122014003GB62302F00090065",
+            "360122014003GB62302F00090069",
+            "360122014003GB62302F00090100",
+            "360122014003GB62302F00090103",
+            "360122014003GB62302F00090007",
+            "360122014005GB00046F00070018",
+            "360122011006GB00305F00110116",
+            "360122011006GB00305F00040067",
+            "360122014004GB00087F00070040",
+            "360122014004GB00087F00070047",
+            "360122014004GB00087F00070041",
+            "360122014004GB00087F00070037",
+            "360122014004GB00087F00070039",
+            "360122014004GB00087F00070020",
+            "360122014004GB00087F00070050",
+            "360122014004GB00087F00070012",
+            "360122014004GB00087F00070014",
+            "360122014004GB00087F00070016",
+            "360122014004GB00087F00070030",
+            "360122014004GB00087F00070023",
+            "360122014004GB00086F00010037",
+            "360122014004GB00086F00010025",
+            "360122014004GB00086F00010040",
+            "360122014004GB00086F00010041",
+            "360122014004GB00086F00010044",
+            "360122014004GB00086F00010047",
+            "360122014004GB00086F00010028",
+            "360122014004GB00086F00010030",
+            "360122014004GB00086F00010050",
+            "360122014004GB00086F00010052",
+            "360122014004GB00086F00010055",
+            "360122014004GB00086F00010057",
+            "360122014004GB00086F00010058",
+            "360122014004GB00086F00010062",
+            "360122014004GB00086F00010063",
+            "360122014004GB00086F00010064",
+            "360122014004GB00086F00010066",
+            "360122014004GB00086F00010068",
+            "360122014004GB00086F00010076",
+            "360122014004GB00086F00010077",
+            "360122014004GB00086F00010078",
+            "360122014004GB00086F00010080",
+            "360122014004GB00086F00010081",
+            "360122014004GB00086F00010085",
+            "360122014004GB00086F00010086",
+            "360122014004GB00086F00010088",
+            "360122014004GB00086F00010090",
+            "360122014004GB00086F00010092",
+            "360122014004GB00086F00010093",
+            "360122014004GB00086F00010094",
+            "360122014004GB00086F00010100",
+            "360122014004GB00086F00010102",
+            "360122014004GB00086F00010103",
+            "360122014004GB00086F00010105",
+            "360122014004GB00086F00010106",
+            "360122014004GB00086F00010110",
+            "360122014004GB00086F00010111",
+            "360122014004GB00086F00010114",
+            "360122014004GB00086F00010116",
+            "360122014004GB00086F00010118",
+            "360122014004GB00086F00010121",
+            "360122014004GB00086F00010123",
+            "360122014004GB00086F00010124",
+            "360122014004GB00086F00010002",
+            "360122014004GB00086F00010006",
+            "360122014004GB00086F00010008",
+            "360122014004GB00086F00010009",
+            "360122014004GB00086F00010010",
+            "360122014004GB00086F00010014",
+            "360122014004GB00086F00010016",
+            "360122014004GB00086F00010022",
+            "360122014004GB00086F00010038",
+            "360122014004GB00087F00010027",
+            "360122014004GB00087F00010019",
+            "360122014004GB00087F00010021",
+            "360122014004GB00087F00010023",
+            "360122014004GB00087F00010025",
+            "360122014004GB00087F00010026",
+            "360122014004GB00087F00010032",
+            "360122014004GB00087F00010036",
+            "360122014004GB00087F00010003",
+            "360122014004GB00087F00010004",
+            "360122014004GB00087F00010006",
+            "360122014004GB00087F00010008",
+            "360122014004GB00087F00010009",
+            "360122014004GB00087F00010012",
+            "360122014004GB00087F00040030",
+            "360122014004GB00087F00040028",
+            "360122014004GB00087F00040020",
+            "360122014004GB00087F00040019",
+            "360122014004GB00087F00040026",
+            "360122014004GB00087F00040024",
+            "360122014004GB00087F00040003",
+            "360122014004GB00087F00040018",
+            "360122014004GB00087F00040014",
+            "360122014004GB00087F00040002",
+            "360122014004GB00087F00040006",
+            "360122014004GB00087F00040034",
+            "360122014004GB00087F00040005",
+            "360122014004GB00087F00040023",
+            "360122014004GB00087F00020028",
+            "360122014004GB00087F00020027",
+            "360122014004GB00087F00020025",
+            "360122014004GB00087F00020033",
+            "360122014004GB00087F00020032",
+            "360122014004GB00087F00020021",
+            "360122014004GB00087F00020020",
+            "360122014004GB00087F00020016",
+            "360122014004GB00087F00020011",
+            "360122014004GB00087F00020036",
+            "360122014004GB00087F00020010",
+            "360122014004GB00087F00020008",
+            "360122014004GB00087F00020007",
+            "360122014004GB00087F00020031",
+            "360122014004GB00087F00020034",
+            "360122014004GB00087F00020035",
+            "360122014004GB00087F00050034",
+            "360122014004GB00087F00050038",
+            "360122014004GB00087F00050039",
+            "360122014004GB00087F00050041",
+            "360122014004GB00087F00050048",
+            "360122014004GB00087F00050049",
+            "360122014004GB00087F00050050",
+            "360122014004GB00087F00050052",
+            "360122014004GB00087F00050054",
+            "360122014004GB00087F00050042",
+            "360122014004GB00087F00050045",
+            "360122014004GB00087F00050058",
+            "360122014004GB00087F00050003",
+            "360122014004GB00087F00050007",
+            "360122014004GB00087F00050010",
+            "360122014004GB00087F00050017",
+            "360122014004GB00087F00050004",
+            "360122014004GB00087F00050005",
+            "360122014004GB00087F00050031",
+            "360122014004GB00087F00050033",
+            "360122014004GB00087F00050061",
+            "360122014004GB00087F00050021",
+            "360122014004GB00087F00030012",
+            "360122014004GB00087F00030018",
+            "360122014004GB00087F00030028",
+            "360122014004GB00087F00030009",
+            "360122014004GB00087F00030006",
+            "360122014004GB00087F00030007",
+            "360122014004GB00087F00030004",
+            "360122014004GB00087F00030008",
+            "360122014004GB00087F00030011",
+            "360122014004GB00087F00030003",
+            "360122014004GB00087F00030015",
+            "360122014004GB00087F00030023",
+            "360122014004GB00087F00030025",
+            "360122014004GB00087F00030017",
+            "360122014004GB00087F00030034",
+            "360122014004GB00086F00020040",
+            "360122014004GB00086F00020041",
+            "360122014004GB00086F00020054",
+            "360122014004GB00086F00020093",
+            "360122014004GB00086F00020094",
+            "360122014004GB00086F00020083",
+            "360122014004GB00086F00020084",
+            "360122014004GB00086F00020005",
+            "360122014004GB00086F00020007",
+            "360122014004GB00086F00020008",
+            "360122014004GB00086F00020045",
+            "360122014004GB00086F00020106",
+            "360122014004GB00086F00020052",
+            "360122014004GB00086F00020070",
+            "360122014004GB00086F00020053",
+            "360122014004GB00086F00020065",
+            "360122014004GB00086F00020066",
+            "360122014004GB00086F00020067",
+            "360122014004GB00086F00020068",
+            "360122014004GB00086F00020069",
+            "360122014004GB00086F00020061",
+            "360122014004GB00086F00020071",
+            "360122014004GB00086F00020063",
+            "360122014004GB00086F00020074",
+            "360122014004GB00086F00020076",
+            "360122014004GB00086F00020099",
+            "360122014004GB00086F00020100",
+            "360122014004GB00086F00020085",
+            "360122014004GB00086F00020086",
+            "360122014004GB00086F00020032",
+            "360122014004GB00086F00020033",
+            "360122014004GB00086F00020034",
+            "360122014004GB00086F00020088",
+            "360122014004GB00086F00020090",
+            "360122014004GB00086F00020079",
+            "360122014004GB00086F00020080",
+            "360122014004GB00086F00020082",
+            "360122014004GB00086F00020015",
+            "360122014004GB00086F00020022",
+            "360122014004GB00086F00020026",
+            "360122014004GB00086F00020031",
+            "360122014004GB00086F00020046",
+            "360122014004GB00086F00020047",
+            "360122014004GB00086F00020048",
+            "360122014004GB00086F00020050",
+            "360122014004GB00086F00020035",
+            "360122014004GB00086F00020037",
+            "360122014004GB00086F00020019",
+            "360122014004GB00086F00020025",
+            "360122014004GB00086F00020039",
+            "360122014004GB00086F00020055",
+            "360122014004GB00086F00020102",
+            "360122014004GB00086F00020042",
+            "360122014004GB00086F00020043",
+            "360122014004GB00086F00020059",
+            "360122014004GB00087F00060001",
+            "360122014004GB00087F00060002",
+            "360122014004GB00087F00060059",
+            "360122014004GB00087F00060061",
+            "360122014004GB00087F00060004",
+            "360122014004GB00087F00060005",
+            "360122014004GB00087F00060006",
+            "360122014004GB00087F00060007",
+            "360122014004GB00087F00060008",
+            "360122014004GB00087F00060014",
+            "360122014004GB00087F00060019",
+            "360122014004GB00087F00060042",
+            "360122014004GB00087F00060043",
+            "360122014004GB00087F00060041",
+            "360122014004GB00087F00060021",
+            "360122014004GB00087F00060046",
+            "360122014004GB00087F00060047",
+            "360122014004GB00087F00060052",
+            "360122014004GB00087F00060027",
+            "360122014004GB00087F00060028",
+            "360122014004GB00087F00060035",
+            "360122014004GB00090F00030061",
+            "360122014004GB00090F00030033",
+            "360122014004GB00090F00030065",
+            "360122014004GB00090F00030066",
+            "360122014004GB00090F00030067",
+            "360122014004GB00090F00030069",
+            "360122014004GB00090F00030070",
+            "360122014004GB00090F00030071",
+            "360122014004GB00090F00030072",
+            "360122014004GB00090F00030084",
+            "360122014004GB00090F00030026",
+            "360122014004GB00090F00030044",
+            "360122014004GB00090F00030040",
+            "360122014004GB00090F00030036",
+            "360122014004GB00090F00030038",
+            "360122014004GB00090F00030031",
+            "360122014004GB00090F00030045",
+            "360122014004GB00090F00030009",
+            "360122014004GB00090F00030046",
+            "360122014004GB00090F00030013",
+            "360122014004GB00090F00030078",
+            "360122014004GB00090F00030079",
+            "360122014004GB00090F00030080",
+            "360122014004GB00090F00030006",
+            "360122014004GB00090F00030010",
+            "360122014004GB00090F00030011",
+            "360122014004GB00090F00030019",
+            "360122014004GB00090F00030016",
+            "360122014004GB00090F00030020",
+            "360122014004GB00090F00030055",
+            "360122014004GB00090F00030056",
+            "360122014004GB00090F00030057",
+            "360122014004GB00090F00030058",
+            "360122014004GB00090F00030060",
+            "360122014004GB00090F00030050",
+            "360122014004GB00090F00030021",
+            "360122014004GB00090F00030022",
+            "360122014004GB00090F00030023",
+            "360122014004GB00090F00030081",
+            "360122014004GB00090F00030082",
+            "360122014004GB00090F00030042",
+            "360122014004GB00090F00030048",
+            "360122014004GB00090F00030024",
+            "360122014004GB00090F00030064",
+            "360122014004GB00086F00030078",
+            "360122014004GB00086F00030037",
+            "360122014004GB00086F00030061",
+            "360122014004GB00086F00030070",
+            "360122014004GB00086F00030032",
+            "360122014004GB00086F00030033",
+            "360122014004GB00086F00030014",
+            "360122014004GB00086F00030042",
+            "360122014004GB00086F00030004",
+            "360122014004GB00086F00030026",
+            "360122014004GB00086F00030044",
+            "360122014004GB00086F00030046",
+            "360122014004GB00086F00030035",
+            "360122014004GB00086F00030047",
+            "360122014004GB00086F00030040",
+            "360122014004GB00086F00030031",
+            "360122014004GB00086F00030015",
+            "360122014004GB00086F00030043",
+            "360122014004GB00086F00030062",
+            "360122014004GB00086F00030059",
+            "360122014004GB00086F00030025",
+            "360122014004GB00086F00030049",
+            "360122014004GB00086F00030051",
+            "360122014004GB00086F00030065",
+            "360122014004GB00086F00030066",
+            "360122014004GB00086F00030067",
+            "360122014004GB00086F00030016",
+            "360122014004GB00086F00030024",
+            "360122014004GB00086F00030038",
+            "360122014004GB00086F00030055",
+            "360122014004GB00086F00030056",
+            "360122014004GB00086F00030057",
+            "360122014004GB00086F00030041",
+            "360122014004GB00086F00040070",
+            "360122014004GB00086F00040068",
+            "360122014004GB00086F00040029",
+            "360122014004GB00086F00040078",
+            "360122014004GB00086F00040075",
+            "360122014004GB00086F00040076",
+            "360122014004GB00086F00040022",
+            "360122014004GB00086F00040034",
+            "360122014004GB00086F00040036",
+            "360122014004GB00086F00040039",
+            "360122014004GB00086F00040040",
+            "360122014004GB00086F00040041",
+            "360122014004GB00086F00040044",
+            "360122014004GB00086F00040035",
+            "360122014004GB00086F00040047",
+            "360122014004GB00086F00040048",
+            "360122014004GB00086F00040050",
+            "360122014004GB00086F00040042",
+            "360122014004GB00086F00040056",
+            "360122014004GB00086F00040004",
+            "360122014004GB00086F00040012",
+            "360122014004GB00086F00040009",
+            "360122014004GB00086F00040010",
+            "360122014004GB00086F00040003",
+            "360122014004GB00086F00040016",
+            "360122014004GB00086F00040017",
+            "360122014004GB00086F00040018",
+            "360122014004GB00086F00040023",
+            "360122014004GB00086F00040065",
+            "360122014004GB00086F00040059",
+            "360122014004GB00086F00040060",
+            "360122014004GB00086F00040053",
+            "360122014004GB00086F00040028",
+            "360122014004GB00090F00040053",
+            "360122014004GB00090F00040088",
+            "360122014004GB00090F00040021",
+            "360122014004GB00090F00040008",
+            "360122014004GB00090F00040002",
+            "360122014004GB00090F00040022",
+            "360122014004GB00090F00040007",
+            "360122014004GB00090F00040012",
+            "360122014004GB00090F00040014",
+            "360122014004GB00090F00040016",
+            "360122014004GB00090F00040010",
+            "360122014004GB00090F00040018",
+            "360122014004GB00090F00040061",
+            "360122014004GB00090F00040051",
+            "360122014004GB00090F00040024",
+            "360122014004GB00090F00040056",
+            "360122014004GB00090F00040057",
+            "360122014004GB00090F00040058",
+            "360122014004GB00090F00040059",
+            "360122014004GB00090F00040060",
+            "360122014004GB00090F00040063",
+            "360122014004GB00090F00040064",
+            "360122014004GB00090F00040065",
+            "360122014004GB00090F00040067",
+            "360122014004GB00090F00040068",
+            "360122014004GB00090F00040070",
+            "360122014004GB00090F00040066",
+            "360122014004GB00090F00040073",
+            "360122014004GB00090F00040074",
+            "360122014004GB00090F00040075",
+            "360122014004GB00090F00040028",
+            "360122014004GB00090F00040033",
+            "360122014004GB00090F00040035",
+            "360122014004GB00090F00040036",
+            "360122014004GB00090F00040037",
+            "360122014004GB00090F00040038",
+            "360122014004GB00090F00040039",
+            "360122014004GB00090F00040040",
+            "360122014004GB00090F00040041",
+            "360122014004GB00090F00040043",
+            "360122014004GB00090F00040044",
+            "360122014004GB00090F00040045",
+            "360122014004GB00090F00040047",
+            "360122014004GB00090F00040048",
+            "360122014004GB00090F00040078",
+            "360122014004GB00090F00040042",
+            "360122014004GB00090F00040080",
+            "360122014004GB00090F00040082",
+            "360122014004GB00090F00040076",
+            "360122014004GB00090F00040084",
+            "360122014004GB00090F00050007",
+            "360122014004GB00090F00050008",
+            "360122014004GB00090F00050009",
+            "360122014004GB00090F00050012",
+            "360122014004GB00090F00050006",
+            "360122014004GB00090F00050016",
+            "360122014004GB00090F00050017",
+            "360122014004GB00090F00050011",
+            "360122014004GB00090F00050015",
+            "360122014004GB00090F00060028",
+            "360122014004GB00090F00060027",
+            "360122014004GB00090F00060024",
+            "360122014004GB00090F00060012",
+            "360122014004GB00090F00060032",
+            "360122014004GB00090F00060023",
+            "360122014004GB00090F00060015",
+            "360122014004GB00090F00060019",
+            "360122014004GB00090F00060014",
+            "360122014004GB00090F00060018",
+            "360122014004GB00090F00060011",
+            "360122014004GB00090F00060009",
+            "360122014004GB00090F00060008",
+            "360122014004GB00090F00060007",
+            "360122014004GB00090F00060006",
+            "360122014004GB00090F00060031",
+            "360122014004GB00090F00060029",
+            "360122014004GB00090F00060002",
+            "360122014004GB00090F00060036",
+            "360122014004GB00090F00060025",
+            "360122014004GB00090F00060035",
+            "360122014004GB00090F00060034",
+            "360122014004GB00090F00060033",
+            "360122014004GB00090F00070016",
+            "360122014004GB00090F00070030",
+            "360122014004GB00090F00070017",
+            "360122014004GB00090F00070003",
+            "360122014004GB00090F00070004",
+            "360122014004GB00090F00070005",
+            "360122014004GB00090F00070008",
+            "360122014004GB00090F00070011",
+            "360122014004GB00090F00070020",
+            "360122014004GB00090F00070036",
+            "360122014004GB00090F00080012",
+            "360122014004GB00090F00080011",
+            "360122014004GB00090F00080010",
+            "360122014004GB00090F00080007",
+            "360122014004GB00090F00080005",
+            "360122014004GB00090F00080004",
+            "360122014004GB00090F00080015",
+            "360122014004GB00090F00080016",
+            "360122014004GB00090F00020032",
+            "360122014004GB00090F00020034",
+            "360122014004GB00090F00020035",
+            "360122014004GB00090F00020036",
+            "360122014004GB00090F00020039",
+            "360122014004GB00090F00020041",
+            "360122014004GB00090F00020043",
+            "360122014004GB00090F00020045",
+            "360122014004GB00090F00020050",
+            "360122014004GB00090F00020063",
+            "360122014004GB00090F00020065",
+            "360122014004GB00090F00020055",
+            "360122014004GB00090F00020069",
+            "360122014004GB00090F00020059",
+            "360122014004GB00090F00020060",
+            "360122014004GB00090F00020070",
+            "360122014004GB00090F00020081",
+            "360122014004GB00090F00020082",
+            "360122014004GB00090F00020087",
+            "360122014004GB00090F00020088",
+            "360122014004GB00090F00020077",
+            "360122014004GB00090F00020084",
+            "360122014004GB00090F00020097",
+            "360122014004GB00090F00020098",
+            "360122014004GB00090F00020093",
+            "360122014004GB00090F00020083",
+            "360122014004GB00090F00020102",
+            "360122014004GB00090F00020103",
+            "360122014004GB00090F00020104",
+            "360122014004GB00090F00020113",
+            "360122014004GB00090F00020114",
+            "360122014004GB00090F00020107",
+            "360122014004GB00090F00020008",
+            "360122014004GB00090F00020118",
+            "360122014004GB00090F00020119",
+            "360122014004GB00090F00020122",
+            "360122014004GB00090F00020124",
+            "360122014004GB00090F00020125",
+            "360122014004GB00090F00020001",
+            "360122014004GB00090F00020108",
+            "360122014004GB00090F00020002",
+            "360122014004GB00090F00020003",
+            "360122014004GB00090F00020005",
+            "360122014004GB00090F00020006",
+            "360122014004GB00090F00020009",
+            "360122014004GB00090F00020027",
+            "360122014004GB00090F00020013",
+            "360122014004GB00090F00020014",
+            "360122014004GB00090F00020015",
+            "360122014004GB00090F00020019",
+            "360122014004GB00090F00020020",
+            "360122014004GB00090F00020022",
+            "360122014004GB00090F00020026",
+            "360122014004GB00090F00020029",
+            "360122014004GB00090F00020030",
+            "360122014004GB00090F00010013",
+            "360122014004GB00090F00010064",
+            "360122014004GB00090F00010015",
+            "360122014004GB00090F00010094",
+            "360122014004GB00090F00010073",
+            "360122014004GB00090F00010076",
+            "360122014004GB00090F00010077",
+            "360122014004GB00090F00010021",
+            "360122014004GB00090F00010023",
+            "360122014004GB00090F00010095",
+            "360122014004GB00090F00010099",
+            "360122014004GB00090F00010101",
+            "360122014004GB00090F00010102",
+            "360122014004GB00090F00010106",
+            "360122014004GB00090F00010107",
+            "360122014004GB00090F00010108",
+            "360122014004GB00090F00010026",
+            "360122014004GB00090F00010020",
+            "360122014004GB00090F00010109",
+            "360122014004GB00090F00010118",
+            "360122014004GB00090F00010055",
+            "360122014004GB00090F00010057",
+            "360122014004GB00090F00010059",
+            "360122014004GB00090F00010050",
+            "360122014004GB00090F00010052",
+            "360122014004GB00090F00010053",
+            "360122014004GB00090F00010054",
+            "360122014004GB00090F00010043",
+            "360122014004GB00090F00010121",
+            "360122014004GB00090F00010045",
+            "360122014004GB00090F00010126",
+            "360122014004GB00090F00010042",
+            "360122014004GB00090F00010046",
+            "360122014004GB00090F00010048",
+            "360122014004GB00090F00010019",
+            "360122014004GB00090F00010075",
+            "360122014004GB00090F00010069",
+            "360122014004GB00090F00010003",
+            "360122014004GB00090F00010004",
+            "360122014004GB00090F00010005",
+            "360122014004GB00090F00010006",
+            "360122014004GB00090F00010008",
+            "360122014004GB00090F00010010",
+            "360122014004GB00090F00010011",
+            "360122014004GB00090F00010012",
+            "360122014004GB00090F00010085",
+            "360122014004GB00090F00010086",
+            "360122014004GB00090F00010080",
+            "360122014004GB00090F00010002",
+            "360122014004GB00090F00010112",
+            "360122014004GB00090F00010030",
+            "360122014004GB00090F00010031",
+            "360122014004GB00090F00010032",
+            "360122014004GB00090F00010035",
+            "360122014004GB00090F00010036",
+            "360122014004GB00090F00010037",
+            "360122014004GB00090F00010078",
+            "360122014004GB00090F00010062",
+            "360122014004GB00090F00010081",
+            "360122014004GB00090F00010014",
+            "360122014003GB62303F00170002",
+            "360122014003GB62303F00100003",
+            "360122014003GB62303F00100001",
+            "360122014003GB62303F00100004",
+            "360122014003GB62303F00130003",
+            "360122014003GB62303F00130004",
+            "360122014003GB62303F00130002",
+            "360122014003GB62303F00020020",
+            "360122014003GB62303F00020023",
+            "360122014003GB62303F00020025",
+            "360122014003GB62303F00020026",
+            "360122014003GB62303F00020032",
+            "360122014003GB62303F00020018",
+            "360122014003GB62303F00020029",
+            "360122014003GB62303F00020014",
+            "360122014003GB62303F00020015",
+            "360122014003GB62303F00020016",
+            "360122014003GB62303F00020033",
+            "360122014003GB62303F00060010",
+            "360122014003GB62303F00060012",
+            "360122014003GB62303F00060023",
+            "360122014003GB62303F00060021",
+            "360122014003GB62303F00060020",
+            "360122014003GB62303F00060019",
+            "360122014003GB62303F00060018",
+            "360122014003GB62303F00060006",
+            "360122014003GB62303F00060005",
+            "360122014003GB62303F00060004",
+            "360122014003GB62303F00060015",
+            "360122014003GB62303F00010058",
+            "360122014003GB62303F00010037",
+            "360122014003GB62303F00010013",
+            "360122014003GB62303F00010017",
+            "360122014003GB62303F00010018",
+            "360122014003GB62303F00010019",
+            "360122014003GB62303F00010021",
+            "360122014003GB62303F00010026",
+            "360122014003GB62303F00010062",
+            "360122014003GB62303F00010057",
+            "360122014003GB62303F00010055",
+            "360122014003GB62303F00010052",
+            "360122014003GB62303F00010046",
+            "360122014003GB62303F00010043",
+            "360122014003GB62303F00010040",
+            "360122014003GB62303F00010030",
+            "360122014003GB62303F00010029",
+            "360122014003GB62303F00010038",
+            "360122014003GB62303F00010059",
+            "360122014003GB62303F00030063",
+            "360122014003GB62303F00030041",
+            "360122014003GB62303F00030040",
+            "360122014003GB62303F00030038",
+            "360122014003GB62303F00030037",
+            "360122014003GB62303F00030015",
+            "360122014003GB62303F00030070",
+            "360122014003GB62303F00030078",
+            "360122014003GB62303F00030077",
+            "360122014003GB62303F00030076",
+            "360122014003GB62303F00030074",
+            "360122014003GB62303F00030009",
+            "360122014003GB62303F00030006",
+            "360122014003GB62303F00030030",
+            "360122014003GB62303F00030002",
+            "360122014003GB62303F00030003",
+            "360122014003GB62303F00030017",
+            "360122014003GB62303F00030019",
+            "360122014003GB62303F00030021",
+            "360122014003GB62303F00030034",
+            "360122014003GB62303F00030035",
+            "360122014003GB62303F00030084",
+            "360122014003GB62303F00030085",
+            "360122014003GB62303F00030087",
+            "360122014003GB62303F00030088",
+            "360122014003GB62303F00030022",
+            "360122014003GB62303F00030032",
+            "360122014003GB62303F00030033",
+            "360122014003GB62303F00030028",
+            "360122014003GB62303F00030065",
+            "360122014003GB62303F00030046",
+            "360122014003GB62303F00030047",
+            "360122014003GB62303F00030049",
+            "360122014003GB62303F00030050",
+            "360122014003GB62303F00030054",
+            "360122014003GB62303F00030055",
+            "360122014003GB62303F00030057",
+            "360122014003GB62303F00030059",
+            "360122014003GB62303F00030067",
+            "360122014003GB62303F00030068",
+            "360122014003GB62303F00030044",
+            "360122014003GB62303F00030005",
+            "360122014003GB62303F00050010",
+            "360122014003GB62303F00050007",
+            "360122014003GB62303F00050011",
+            "360122014003GB62303F00050022",
+            "360122014003GB62303F00050031",
+            "360122014003GB62303F00050028",
+            "360122014003GB62303F00050027",
+            "360122014003GB62303F00070002",
+            "360122014003GB62303F00070001",
+            "360122014003GB62303F00160004",
+            "360122014003GB62303F00160002",
+            "360122014003GB62303F00160001",
+            "360122014004GB00086F00060011",
+            "360122014004GB00086F00060034",
+            "360122014004GB00086F00060004",
+            "360122014004GB00086F00060007",
+            "360122014004GB00086F00060008",
+            "360122014004GB00086F00060036",
+            "360122014004GB00086F00060014",
+            "360122014004GB00086F00060017",
+            "360122014004GB00086F00060021",
+            "360122014004GB00086F00060022",
+            "360122014004GB00086F00060023",
+            "360122014004GB00086F00060029",
+            "360122014004GB00086F00060030",
+            "360122014004GB00086F00060031",
+            "360122014004GB00086F00060003",
+            "360122014003GB62303F00090003",
+            "360122014003GB62303F00090001",
+            "360122014003GB62303F00120002",
+            "360122014003GB62303F00120004",
+            "360122014003GB62303F00150002",
+            "360122014003GB62303F00150001",
+            "360122014004GB00086F00050037",
+            "360122014004GB00086F00050034",
+            "360122014004GB00086F00050033",
+            "360122014004GB00086F00050032",
+            "360122014004GB00086F00050031",
+            "360122014004GB00086F00050030",
+            "360122014004GB00086F00050029",
+            "360122014004GB00086F00050028",
+            "360122014004GB00086F00050027",
+            "360122014004GB00086F00050026",
+            "360122014004GB00086F00050025",
+            "360122014004GB00086F00050024",
+            "360122014004GB00086F00050023",
+            "360122014004GB00086F00050017",
+            "360122014004GB00086F00050016",
+            "360122014004GB00086F00050013",
+            "360122014004GB00086F00050012",
+            "360122014004GB00086F00050010",
+            "360122014004GB00086F00050009",
+            "360122014004GB00086F00050043",
+            "360122014004GB00086F00050044",
+            "360122014004GB00086F00050045",
+            "360122014004GB00086F00050047",
+            "360122014004GB00086F00050049",
+            "360122014004GB00086F00050052",
+            "360122014004GB00086F00050054",
+            "360122014004GB00086F00050015",
+            "360122014004GB00086F00050005",
+            "360122014004GB00086F00050006",
+            "360122014004GB00086F00050003",
+            "360122014004GB00086F00050004",
+            "360122014004GB00086F00050042",
+            "360122014004GB00086F00050041",
+            "360122014004GB00086F00070023",
+            "360122014004GB00086F00070039",
+            "360122014004GB00086F00070009",
+            "360122014004GB00086F00070031",
+            "360122014004GB00086F00070050",
+            "360122014004GB00086F00070046",
+            "360122014004GB00086F00070044",
+            "360122014004GB00086F00070043",
+            "360122014004GB00086F00070035",
+            "360122014004GB00086F00070030",
+            "360122014004GB00086F00070029",
+            "360122014004GB00086F00070033",
+            "360122014004GB00086F00070027",
+            "360122014004GB00086F00070018",
+            "360122014004GB00086F00070049",
+            "360122014004GB00086F00070054",
+            "360122014004GB00086F00070037",
+            "360122014004GB00086F00070015",
+            "360122014004GB00086F00070012",
+            "360122014004GB00086F00070005",
+            "360122014004GB00086F00070025",
+            "360122014004GB00086F00070002",
+            "360122014003GB62303F00080002",
+            "360122014004GB00086F00080013",
+            "360122014004GB00086F00080012",
+            "360122014004GB00086F00080022",
+            "360122014004GB00086F00080009",
+            "360122014004GB00086F00080034",
+            "360122014004GB00086F00080020",
+            "360122014004GB00086F00080002",
+            "360122014004GB00086F00080024",
+            "360122014004GB00086F00080016",
+            "360122014004GB00086F00080021",
+            "360122014004GB00086F00080023",
+            "360122014004GB00086F00080028",
+            "360122014004GB00086F00080029",
+            "360122014004GB00086F00080010",
+            "360122014004GB00086F00080015",
+            "360122014004GB00105F00040035",
+            "360122014004GB00105F00040025",
+            "360122014004GB00105F00040040",
+            "360122014004GB00105F00040041",
+            "360122014004GB00105F00040042",
+            "360122014004GB00105F00040043",
+            "360122014004GB00105F00040034",
+            "360122014004GB00105F00040011",
+            "360122014004GB00105F00040013",
+            "360122014004GB00105F00040015",
+            "360122014004GB00105F00040017",
+            "360122014004GB00105F00040037",
+            "360122014004GB00105F00040021",
+            "360122014004GB00105F00040020",
+            "360122014004GB00105F00040009",
+            "360122014004GB00105F00040010",
+            "360122014004GB00105F00040050",
+            "360122014004GB00105F00040049",
+            "360122014004GB00105F00040026",
+            "360122014004GB00105F00040030",
+            "360122014004GB00105F00040029",
+            "360122014004GB00105F00010031",
+            "360122014004GB00105F00010008",
+            "360122014004GB00105F00010053",
+            "360122014004GB00105F00010054",
+            "360122014004GB00105F00010039",
+            "360122014004GB00105F00010041",
+            "360122014004GB00105F00010002",
+            "360122014004GB00105F00010022",
+            "360122014004GB00105F00010025",
+            "360122014004GB00105F00010043",
+            "360122014004GB00105F00010044",
+            "360122014004GB00105F00010045",
+            "360122014004GB00105F00010032",
+            "360122014004GB00105F00010030",
+            "360122014004GB00105F00010029",
+            "360122014004GB00105F00010020",
+            "360122014004GB00105F00010019",
+            "360122014004GB00105F00010017",
+            "360122014004GB00105F00010016",
+            "360122014004GB00105F00010015",
+            "360122014004GB00105F00010013",
+            "360122014004GB00105F00010035",
+            "360122014004GB00105F00020013",
+            "360122014004GB00105F00020017",
+            "360122014004GB00105F00020012",
+            "360122014004GB00105F00020021",
+            "360122014004GB00105F00020022",
+            "360122014004GB00105F00020024",
+            "360122014004GB00105F00020048",
+            "360122014004GB00105F00020007",
+            "360122014004GB00105F00020027",
+            "360122014004GB00105F00020029",
+            "360122014004GB00105F00020033",
+            "360122014004GB00105F00020045",
+            "360122014004GB00105F00020046",
+            "360122014004GB00105F00020037",
+            "360122014004GB00105F00020038",
+            "360122014004GB00105F00020041",
+            "360122014004GB00105F00020002",
+            "360122014004GB00105F00020016",
+            "360122014004GB00105F00050053",
+            "360122014004GB00105F00050017",
+            "360122014004GB00105F00050054",
+            "360122014004GB00105F00050003",
+            "360122014004GB00105F00050035",
+            "360122014004GB00105F00050034",
+            "360122014004GB00105F00050033",
+            "360122014004GB00105F00050044",
+            "360122014004GB00105F00050012",
+            "360122014004GB00105F00050051",
+            "360122014004GB00105F00050050",
+            "360122014004GB00105F00050046",
+            "360122014004GB00105F00050041",
+            "360122014004GB00105F00050043",
+            "360122014004GB00105F00050042",
+            "360122014004GB00105F00050014",
+            "360122014004GB00105F00050007",
+            "360122014004GB00105F00050004",
+            "360122014004GB00105F00050015",
+            "360122014004GB00105F00050011",
+            "360122014004GB00105F00050040",
+            "360122014004GB00105F00050010",
+            "360122014004GB00105F00050027",
+            "360122014004GB00105F00050026",
+            "360122014004GB00105F00050028",
+            "360122014004GB00105F00050030",
+            "360122014004GB00105F00030010",
+            "360122014004GB00105F00030006",
+            "360122014004GB00105F00030038",
+            "360122014004GB00105F00030040",
+            "360122014004GB00105F00030039",
+            "360122014004GB00105F00030034",
+            "360122014004GB00105F00030032",
+            "360122014004GB00105F00030044",
+            "360122014004GB00105F00030036",
+            "360122014004GB00105F00030031",
+            "360122014004GB00105F00030023",
+            "360122014004GB00105F00030022",
+            "360122014004GB00105F00030046",
+            "360122014004GB00105F00030048",
+            "360122014004GB00105F00030047",
+            "360122014004GB00105F00030016",
+            "360122014004GB00105F00030015",
+            "360122014004GB00105F00030013",
+            "360122014004GB00105F00030050",
+            "360122014003GB62303F00020021",
+            "360122014003GB62303F00010035",
+            "360122011003GB00335F00290032",
+            "360122014004GB00112F00020028",
+            "360122014004GB00112F00020013",
+            "360122014004GB00112F00020010",
+            "360122014004GB00112F00020012",
+            "360122014004GB00112F00020014",
+            "360122014004GB00112F00020015",
+            "360122014004GB00112F00020016",
+            "360122014004GB00112F00020003",
+            "360122014004GB00112F00020004",
+            "360122014004GB00112F00020029",
+            "360122014004GB00112F00020009",
+            "360122014004GB00112F00020033",
+            "360122014004GB00112F00020035",
+            "360122014004GB00112F00020036",
+            "360122014004GB00112F00020032",
+            "360122014004GB00112F00020037",
+            "360122014004GB00112F00020044",
+            "360122014004GB00112F00020045",
+            "360122014004GB00112F00020046",
+            "360122014004GB00112F00020048",
+            "360122014004GB00112F00020052",
+            "360122014004GB00112F00020053",
+            "360122014004GB00112F00020055",
+            "360122014004GB00112F00020049",
+            "360122014004GB00112F00020076",
+            "360122014004GB00112F00020077",
+            "360122014004GB00112F00020078",
+            "360122014004GB00112F00020007",
+            "360122014004GB00112F00020006",
+            "360122014004GB00112F00020071",
+            "360122014004GB00112F00020072",
+            "360122014004GB00112F00020073",
+            "360122014004GB00112F00020075",
+            "360122014004GB00112F00020019",
+            "360122014004GB00112F00020020",
+            "360122014004GB00112F00020008",
+            "360122014004GB00112F00020001",
+            "360122014004GB00112F00020002",
+            "360122014004GB00112F00020005",
+            "360122014004GB00112F00020040",
+            "360122014004GB00112F00020041",
+            "360122014004GB00112F00020030",
+            "360122014004GB00112F00020031",
+            "360122014004GB00112F00020017",
+            "360122014004GB00112F00020021",
+            "360122014004GB00112F00020023",
+            "360122014004GB00112F00020024",
+            "360122014004GB00112F00020060",
+            "360122014004GB00112F00020061",
+            "360122014004GB00112F00020062",
+            "360122014004GB00112F00020063",
+            "360122014004GB00112F00020065",
+            "360122014004GB00112F00020066",
+            "360122014004GB00112F00020056",
+            "360122014004GB00112F00020057",
+            "360122014004GB00112F00020025",
+            "360122014004GB00112F00020026",
+            "360122014004GB00112F00020027",
+            "360122014004GB00112F00040034",
+            "360122014004GB00112F00040033",
+            "360122014004GB00112F00040036",
+            "360122014004GB00112F00040037",
+            "360122014004GB00112F00040038",
+            "360122014004GB00112F00040039",
+            "360122014004GB00112F00040040",
+            "360122014004GB00112F00040002",
+            "360122014004GB00112F00040004",
+            "360122014004GB00112F00040001",
+            "360122014004GB00112F00040003",
+            "360122014004GB00112F00040005",
+            "360122014004GB00112F00040006",
+            "360122014004GB00112F00040014",
+            "360122014004GB00112F00040007",
+            "360122014004GB00112F00040009",
+            "360122014004GB00112F00040010",
+            "360122014004GB00112F00040025",
+            "360122014004GB00112F00040026",
+            "360122014004GB00112F00040011",
+            "360122014004GB00112F00040012",
+            "360122014004GB00112F00040008",
+            "360122014004GB00112F00040013",
+            "360122014004GB00112F00040015",
+            "360122014004GB00112F00040016",
+            "360122014004GB00112F00040017",
+            "360122014004GB00112F00040018",
+            "360122014004GB00112F00040019",
+            "360122014004GB00112F00040020",
+            "360122014004GB00112F00040021",
+            "360122014004GB00112F00040022",
+            "360122014004GB00112F00040024",
+            "360122014004GB00112F00040027",
+            "360122014004GB00112F00040029",
+            "360122014004GB00112F00040023",
+            "360122014004GB00112F00040030",
+            "360122014004GB00112F00040031",
+            "360122014004GB00112F00040032",
+            "360122014004GB00112F00040028",
+            "360122014004GB00112F00040035",
+            "360122014004GB00112F00010001",
+            "360122014004GB00112F00010004",
+            "360122014004GB00112F00010002",
+            "360122014004GB00112F00010005",
+            "360122014004GB00112F00010003",
+            "360122014004GB00112F00010006",
+            "360122014004GB00112F00010007",
+            "360122014004GB00112F00010023",
+            "360122014004GB00112F00010024",
+            "360122014004GB00112F00010008",
+            "360122014004GB00112F00010011",
+            "360122014004GB00112F00010012",
+            "360122014004GB00112F00010041",
+            "360122014004GB00112F00010042",
+            "360122014004GB00112F00010043",
+            "360122014004GB00112F00010044",
+            "360122014004GB00112F00010056",
+            "360122014004GB00112F00010050",
+            "360122014004GB00112F00010045",
+            "360122014004GB00112F00010048",
+            "360122014004GB00112F00010052",
+            "360122014004GB00112F00010053",
+            "360122014004GB00112F00010057",
+            "360122014004GB00112F00010058",
+            "360122014004GB00112F00010059",
+            "360122014004GB00112F00010060",
+            "360122014004GB00112F00010061",
+            "360122014004GB00112F00010047",
+            "360122014004GB00112F00010062",
+            "360122014004GB00112F00010063",
+            "360122014004GB00112F00010064",
+            "360122014004GB00112F00010065",
+            "360122014004GB00112F00010066",
+            "360122014004GB00112F00010067",
+            "360122014004GB00112F00010025",
+            "360122014004GB00112F00010017",
+            "360122014004GB00112F00010018",
+            "360122014004GB00112F00010010",
+            "360122014004GB00112F00010019",
+            "360122014004GB00112F00010020",
+            "360122014004GB00112F00010021",
+            "360122014004GB00112F00010026",
+            "360122014004GB00112F00010027",
+            "360122014004GB00112F00010022",
+            "360122014004GB00112F00010028",
+            "360122014004GB00112F00010029",
+            "360122014004GB00112F00010030",
+            "360122014004GB00112F00010051",
+            "360122014004GB00112F00010049",
+            "360122014004GB00112F00010046",
+            "360122014004GB00112F00010054",
+            "360122014004GB00112F00010055",
+            "360122014004GB00112F00010032",
+            "360122014004GB00112F00010033",
+            "360122014004GB00112F00010036",
+            "360122014004GB00112F00010037",
+            "360122014004GB00112F00010038",
+            "360122014004GB00112F00010034",
+            "360122014004GB00112F00010035",
+            "360122014004GB00112F00010039",
+            "360122014004GB00112F00010040",
+            "360122014004GB00112F00010068",
+            "360122014004GB00112F00010069",
+            "360122014004GB00112F00010070",
+            "360122014004GB00112F00010071",
+            "360122014004GB00112F00010072",
+            "360122014004GB00112F00010073",
+            "360122014004GB00112F00010074",
+            "360122014004GB00112F00010075",
+            "360122014004GB00112F00010076",
+            "360122014004GB00112F00010077",
+            "360122014004GB00112F00010078",
+            "360122014004GB00112F00010009",
+            "360122014004GB00112F00010013",
+            "360122014004GB00112F00010014",
+            "360122014004GB00112F00010015",
+            "360122014004GB00112F00010031",
+            "360122014004GB00112F00010016",
+            "360122014004GB00112F00030028",
+            "360122014004GB00112F00030027",
+            "360122014004GB00112F00030029",
+            "360122014004GB00112F00030030",
+            "360122014004GB00112F00030031",
+            "360122014004GB00112F00030032",
+            "360122014004GB00112F00030033",
+            "360122014004GB00112F00030034",
+            "360122014004GB00112F00030036",
+            "360122014004GB00112F00030035",
+            "360122014004GB00112F00030037",
+            "360122014004GB00112F00030040",
+            "360122014004GB00112F00030038",
+            "360122014004GB00112F00030039",
+            "360122014004GB00112F00030010",
+            "360122014004GB00112F00030001",
+            "360122014004GB00112F00030002",
+            "360122014004GB00112F00030003",
+            "360122014004GB00112F00030004",
+            "360122014004GB00112F00030005",
+            "360122014004GB00112F00030006",
+            "360122014004GB00112F00030007",
+            "360122014004GB00112F00030008",
+            "360122014004GB00112F00030009",
+            "360122014004GB00112F00030011",
+            "360122014004GB00112F00030012",
+            "360122014004GB00112F00030013",
+            "360122014004GB00112F00030014",
+            "360122014004GB00112F00030015",
+            "360122014004GB00112F00030016",
+            "360122014004GB00112F00030017",
+            "360122014004GB00112F00030019",
+            "360122014004GB00112F00030020",
+            "360122014004GB00112F00030021",
+            "360122014004GB00112F00030022",
+            "360122014004GB00112F00030018",
+            "360122014004GB00112F00030023",
+            "360122014004GB00112F00030024",
+            "360122014004GB00112F00030025",
+            "360122014004GB00112F00030026",
+            "360122014005GB00046F00050021",
+            "360122011003GB00332F00110004",
+            "360122014004GB00122F00050021",
+            "360122014004GB00122F00050022",
+            "360122014004GB00122F00050019",
+            "360122014004GB00122F00050017",
+            "360122014004GB00122F00050016",
+            "360122014004GB00122F00050013",
+            "360122014004GB00122F00050065",
+            "360122014004GB00122F00050064",
+            "360122014004GB00122F00050012",
+            "360122014004GB00122F00050010",
+            "360122014004GB00122F00050009",
+            "360122014004GB00122F00050060",
+            "360122014004GB00122F00050059",
+            "360122014004GB00122F00050008",
+            "360122014004GB00122F00050006",
+            "360122014004GB00122F00050055",
+            "360122014004GB00122F00050004",
+            "360122014004GB00122F00050037",
+            "360122014004GB00122F00050033",
+            "360122014004GB00122F00050032",
+            "360122014004GB00122F00050029",
+            "360122014004GB00122F00050028",
+            "360122014004GB00122F00050025",
+            "360122014004GB00122F00050024",
+            "360122014004GB00122F00050049",
+            "360122014004GB00122F00050044",
+            "360122014004GB00122F00050040",
+            "360122014004GB00122F00050020",
+            "360122014004GB00091F00130024",
+            "360122014004GB00091F00130031",
+            "360122014004GB00091F00130023",
+            "360122014004GB00091F00130022",
+            "360122014004GB00091F00130020",
+            "360122014004GB00091F00130018",
+            "360122014004GB00091F00130016",
+            "360122014004GB00091F00130014",
+            "360122014004GB00091F00130013",
+            "360122014004GB00091F00130012",
+            "360122014004GB00091F00130008",
+            "360122014004GB00091F00130007",
+            "360122014004GB00091F00130004",
+            "360122014004GB00091F00130003",
+            "360122014004GB00091F00130002",
+            "360122014004GB00091F00130001",
+            "360122014004GB00091F00130056",
+            "360122014004GB00091F00130063",
+            "360122014004GB00091F00130062",
+            "360122014004GB00091F00130060",
+            "360122014004GB00091F00130059",
+            "360122014004GB00091F00130057",
+            "360122014004GB00091F00130054",
+            "360122014004GB00091F00130050",
+            "360122014004GB00091F00130049",
+            "360122014004GB00091F00130048",
+            "360122014004GB00091F00130039",
+            "360122014004GB00091F00130038",
+            "360122014004GB00091F00130036",
+            "360122014004GB00091F00130033",
+            "360122014004GB00091F00130035",
+            "360122014004GB00091F00090034",
+            "360122014004GB00091F00090001",
+            "360122014004GB00091F00090024",
+            "360122014004GB00091F00090003",
+            "360122014004GB00091F00090008",
+            "360122014004GB00091F00090012",
+            "360122014004GB00091F00090002",
+            "360122014004GB00091F00120004",
+            "360122014004GB00091F00120009",
+            "360122014004GB00091F00120044",
+            "360122014004GB00091F00120043",
+            "360122014004GB00091F00120032",
+            "360122014004GB00091F00120037",
+            "360122014004GB00091F00120011",
+            "360122014004GB00091F00120012",
+            "360122014004GB00091F00120017",
+            "360122014004GB00091F00120020",
+            "360122014004GB00091F00120030",
+            "360122014004GB00091F00120031",
+            "360122014004GB00091F00040017",
+            "360122014004GB00091F00040016",
+            "360122014004GB00091F00040015",
+            "360122014004GB00091F00040010",
+            "360122014004GB00091F00040008",
+            "360122014004GB00091F00040007",
+            "360122014004GB00091F00040006",
+            "360122014004GB00091F00040005",
+            "360122014004GB00091F00040018",
+            "360122014004GB00091F00040023",
+            "360122014004GB00091F00040022",
+            "360122014004GB00091F00040030",
+            "360122014004GB00091F00040029",
+            "360122014004GB00091F00040027",
+            "360122014004GB00091F00040026",
+            "360122014004GB00091F00040024",
+            "360122014004GB00091F00070014",
+            "360122014004GB00091F00070013",
+            "360122014004GB00091F00070009",
+            "360122014004GB00091F00070010",
+            "360122014004GB00091F00070012",
+            "360122014004GB00091F00060011",
+            "360122014004GB00091F00060005",
+            "360122014004GB00091F00060018",
+            "360122014004GB00091F00060026",
+            "360122014004GB00091F00060034",
+            "360122014004GB00091F00060032",
+            "360122014004GB00091F00060030",
+            "360122014004GB00091F00060029",
+            "360122014004GB00091F00060027",
+            "360122014004GB00091F00060010",
+            "360122014004GB00091F00060009",
+            "360122014004GB00091F00060006",
+            "360122014004GB00091F00060002",
+            "360122014004GB00091F00060035",
+            "360122014004GB00091F00060016",
+            "360122014004GB00091F00010037",
+            "360122014004GB00091F00010038",
+            "360122014004GB00091F00010021",
+            "360122014004GB00091F00010029",
+            "360122014004GB00091F00010023",
+            "360122014004GB00091F00010024",
+            "360122014004GB00091F00010026",
+            "360122014004GB00091F00010028",
+            "360122014004GB00091F00010030",
+            "360122014004GB00091F00010035",
+            "360122014004GB00091F00010039",
+            "360122014004GB00091F00010041",
+            "360122014004GB00091F00010042",
+            "360122014004GB00091F00010043",
+            "360122014004GB00091F00010044",
+            "360122014004GB00091F00010047",
+            "360122014004GB00091F00010055",
+            "360122014004GB00091F00010056",
+            "360122014004GB00091F00010060",
+            "360122014004GB00091F00010065",
+            "360122014004GB00091F00010063",
+            "360122014004GB00091F00010072",
+            "360122014004GB00091F00010074",
+            "360122014004GB00091F00010076",
+            "360122014004GB00091F00010077",
+            "360122014004GB00091F00010079",
+            "360122014004GB00091F00010081",
+            "360122014004GB00091F00010083",
+            "360122014004GB00091F00010087",
+            "360122014004GB00091F00010089",
+            "360122014004GB00091F00010092",
+            "360122014004GB00091F00010093",
+            "360122014004GB00091F00010094",
+            "360122014004GB00091F00010095",
+            "360122014004GB00091F00010099",
+            "360122014004GB00091F00010001",
+            "360122014004GB00091F00010012",
+            "360122014004GB00091F00010004",
+            "360122014004GB00091F00010005",
+            "360122014004GB00091F00010006",
+            "360122014004GB00091F00010008",
+            "360122014004GB00091F00010009",
+            "360122014004GB00091F00010010",
+            "360122014004GB00091F00010011",
+            "360122014004GB00091F00010016",
+            "360122014004GB00091F00020062",
+            "360122014004GB00091F00020056",
+            "360122014004GB00091F00020075",
+            "360122014004GB00091F00020065",
+            "360122014004GB00091F00020019",
+            "360122014004GB00091F00020020",
+            "360122014004GB00091F00020021",
+            "360122014004GB00091F00020018",
+            "360122014004GB00091F00020079",
+            "360122014004GB00091F00020080",
+            "360122014004GB00091F00020028",
+            "360122014004GB00091F00020029",
+            "360122014004GB00091F00020036",
+            "360122014004GB00091F00020043",
+            "360122014004GB00091F00020046",
+            "360122014004GB00091F00020049",
+            "360122014004GB00091F00020050",
+            "360122014004GB00091F00020051",
+            "360122014004GB00091F00020012",
+            "360122014004GB00091F00020014",
+            "360122014004GB00091F00020016",
+            "360122014004GB00091F00020066",
+            "360122014004GB00091F00020071",
+            "360122014004GB00091F00020072",
+            "360122014004GB00091F00020031",
+            "360122014004GB00091F00020030",
+            "360122014004GB00091F00020034",
+            "360122014004GB00091F00020004",
+            "360122014004GB00091F00020005",
+            "360122014004GB00091F00020001",
+            "360122014004GB00091F00020008",
+            "360122014004GB00091F00020011",
+            "360122014004GB00091F00020081",
+            "360122014004GB00091F00020082",
+            "360122014004GB00091F00020084",
+            "360122014004GB00091F00080017",
+            "360122014004GB00091F00080013",
+            "360122014004GB00091F00080028",
+            "360122014004GB00091F00080030",
+            "360122014004GB00091F00080031",
+            "360122014004GB00091F00080018",
+            "360122014004GB00091F00080020",
+            "360122014004GB00091F00080019",
+            "360122014004GB00091F00080004",
+            "360122014004GB00091F00080033",
+            "360122014004GB00091F00080034",
+            "360122014004GB00091F00080035",
+            "360122014004GB00091F00080005",
+            "360122014004GB00091F00080006",
+            "360122014004GB00091F00080008",
+            "360122014004GB00091F00080009",
+            "360122014004GB00091F00080010",
+            "360122014004GB00091F00080011",
+            "360122014004GB00091F00080012",
+            "360122014004GB00091F00080001",
+            "360122014004GB00091F00080027",
+            "360122014004GB00091F00100001",
+            "360122014004GB00091F00100004",
+            "360122014004GB00091F00100003",
+            "360122014004GB00091F00100012",
+            "360122014004GB00091F00050016",
+            "360122014004GB00091F00050007",
+            "360122014004GB00091F00050003",
+            "360122014004GB00091F00050006",
+            "360122014004GB00091F00030013",
+            "360122014004GB00091F00030003",
+            "360122014004GB00091F00030002",
+            "360122014004GB00091F00030011",
+            "360122014004GB00091F00030006",
+            "360122014004GB00091F00030009",
+            "360122014004GB00091F00030018",
+            "360122014004GB00091F00030008",
+            "360122014004GB00091F00030001",
+            "360122014004GB00122F00060032",
+            "360122014004GB00122F00060033",
+            "360122014004GB00122F00060034",
+            "360122014004GB00122F00060037",
+            "360122014004GB00122F00060038",
+            "360122014004GB00122F00060024",
+            "360122014004GB00122F00060021",
+            "360122014004GB00122F00060020",
+            "360122014004GB00122F00060031",
+            "360122014004GB00122F00060030",
+            "360122014004GB00122F00060019",
+            "360122014004GB00122F00060017",
+            "360122014004GB00122F00060015",
+            "360122014004GB00122F00060014",
+            "360122014004GB00122F00060013",
+            "360122014004GB00122F00060012",
+            "360122014004GB00122F00060011",
+            "360122014004GB00122F00060009",
+            "360122014004GB00122F00060008",
+            "360122014004GB00122F00060005",
+            "360122014004GB00122F00060027",
+            "360122014004GB00122F00060025",
+            "360122014004GB00122F00060026",
+            "360122014004GB00122F00070042",
+            "360122014004GB00122F00070019",
+            "360122014004GB00122F00070016",
+            "360122014004GB00122F00070003",
+            "360122014004GB00122F00070001",
+            "360122014004GB00122F00070025",
+            "360122014004GB00122F00070013",
+            "360122014004GB00122F00070037",
+            "360122014004GB00122F00070051",
+            "360122014004GB00122F00070050",
+            "360122014004GB00122F00070049",
+            "360122014004GB00122F00070043",
+            "360122014004GB00122F00070023",
+            "360122014004GB00122F00070047",
+            "360122014004GB00122F00070046",
+            "360122014004GB00122F00070021",
+            "360122014004GB00122F00070033",
+            "360122014004GB00122F00070045",
+            "360122014004GB00122F00070044",
+            "360122014004GB00122F00070029",
+            "360122014004GB00122F00070027",
+            "360122014004GB00122F00070007",
+            "360122014004GB00122F00030016",
+            "360122014004GB00122F00030017",
+            "360122014004GB00122F00030018",
+            "360122014004GB00122F00030019",
+            "360122014004GB00122F00030020",
+            "360122014004GB00122F00030021",
+            "360122014004GB00122F00030022",
+            "360122014004GB00122F00030014",
+            "360122014004GB00122F00030015",
+            "360122014004GB00122F00030043",
+            "360122014004GB00122F00030006",
+            "360122014004GB00122F00030005",
+            "360122014004GB00122F00030042",
+            "360122014004GB00122F00030004",
+            "360122014004GB00122F00030003",
+            "360122014004GB00122F00030036",
+            "360122014004GB00122F00030032",
+            "360122014004GB00122F00030030",
+            "360122014004GB00122F00030028",
+            "360122014004GB00122F00030051",
+            "360122014004GB00122F00030050",
+            "360122014004GB00122F00030012",
+            "360122014004GB00122F00030049",
+            "360122014004GB00122F00030047",
+            "360122014004GB00122F00030011",
+            "360122014004GB00122F00030010",
+            "360122014004GB00122F00030009",
+            "360122014004GB00122F00030046",
+            "360122014004GB00122F00030045",
+            "360122014004GB00122F00030007",
+            "360122014004GB00122F00030008",
+            "360122014004GB00091F00120028",
+            "360122014004GB00122F00080010",
+            "360122014004GB00122F00080009",
+            "360122014004GB00122F00080035",
+            "360122014004GB00122F00080036",
+            "360122014004GB00122F00080038",
+            "360122014004GB00122F00080039",
+            "360122014004GB00122F00080041",
+            "360122014004GB00122F00080042",
+            "360122014004GB00122F00080044",
+            "360122014004GB00122F00080045",
+            "360122014004GB00122F00080011",
+            "360122014004GB00122F00080013",
+            "360122014004GB00122F00080015",
+            "360122014004GB00122F00080017",
+            "360122014004GB00122F00080019",
+            "360122014004GB00122F00080022",
+            "360122014004GB00122F00080024",
+            "360122014004GB00122F00080026",
+            "360122014004GB00122F00080028",
+            "360122014004GB00122F00080032",
+            "360122014004GB00122F00080001",
+            "360122014004GB00122F00080002",
+            "360122014004GB00122F00080006",
+            "360122014004GB00077F00100012",
+            "360122014004GB00077F00080006",
+            "360122014004GB00077F00080013",
+            "360122014004GB00077F00090004",
+            "360122014004GB00077F00090005",
+            "360122014004GB00077F00090006",
+            "360122014005GB00046F00050082",
+            "360122014005GB00046F00050083",
+            "360122011002GB00338F99910001",
+            "360122011002GB00338F99930001",
+            "360122011002GB00338F99920001",
+            "360122011002GB00338F99880001",
+            "360122011002GB00338F99900001",
+            "360122011002GB00338F99870001",
+            "360122011002GB00338F99890001",
+            "360122011002GB00338F99860001",
+            "360122011002GB00338F99980001",
+            "360122011002GB00338F99960001",
+            "360122011002GB00338F99850001",
+            "360122011002GB00338F99970001",
+            "360122011002GB00338F99990001",
+            "360122011002GB00338F99950001",
+            "360122011002GB00338F99940001",
+            "360122014004GB00091F00130017",
+            "360122014003GB62303F00050032",
+            "360122014003GB62303F00050020",
+            "360122014003GB62303F00050009",
+            "360122014003GB62303F00050016",
+            "360122014003GB62303F00050008",
+            "360122014003GB62303F00050014",
+            "360122014003GB62303F00050015",
+            "360122014003GB62303F00050019",
+            "360122014003GB62303F00050030",
+            "360122014003GB62303F00050005",
+            "360122014003GB62303F00050004",
+            "360122014003GB62303F00050006",
+            "360122014003GB62303F00050002",
+            "360122014003GB62303F00050026",
+            "360122014003GB62303F00050012",
+            "360122014003GB62303F00050018",
+            "360122014003GB62303F00050017",
+            "360122014003GB62303F00050003",
+            "360122014003GB62303F00050023",
+            "360122014003GB62303F00050025",
+            "360122014003GB62303F00050013",
+            "360122014003GB62303F00050029",
+            "360122014003GB62303F00150003",
+            "360122014003GB62303F00150004",
+            "360122014003GB62303F00130001",
+            "360122014004GB00091F00130015",
+            "360122014004GB00091F00130041",
+            "360122014004GB00091F00130025",
+            "360122014004GB00091F00130026",
+            "360122014004GB00091F00130027",
+            "360122014004GB00091F00130028",
+            "360122014004GB00091F00130029",
+            "360122014004GB00091F00130030",
+            "360122014004GB00091F00130061",
+            "360122014004GB00091F00130064",
+            "360122014004GB00091F00130065",
+            "360122014004GB00091F00130066",
+            "360122014004GB00091F00130032",
+            "360122014004GB00091F00130034",
+            "360122014004GB00091F00130037",
+            "360122014004GB00091F00130040",
+            "360122014004GB00091F00130044",
+            "360122014004GB00091F00130045",
+            "360122014004GB00091F00130046",
+            "360122014004GB00091F00130043",
+            "360122014004GB00091F00130047",
+            "360122014004GB00091F00130042",
+            "360122014004GB00091F00130005",
+            "360122014004GB00091F00130009",
+            "360122014004GB00091F00130010",
+            "360122014004GB00091F00130011",
+            "360122014004GB00091F00130051",
+            "360122014004GB00091F00130052",
+            "360122014004GB00091F00130053",
+            "360122014004GB00091F00130055",
+            "360122014004GB00091F00130058",
+            "360122014004GB00091F00130006",
+            "360122014004GB00091F00130019",
+            "360122014004GB00091F00130021",
+            "360122014004GB00091F00080025",
+            "360122014004GB00091F00080003",
+            "360122014004GB00091F00080002",
+            "360122014004GB00091F00080032",
+            "360122014004GB00091F00080029",
+            "360122014004GB00091F00080026",
+            "360122014004GB00091F00080022",
+            "360122014004GB00091F00080016",
+            "360122014004GB00091F00080007",
+            "360122014004GB00091F00080014",
+            "360122014004GB00091F00080015",
+            "360122014004GB00091F00080036",
+            "360122014004GB00091F00080021",
+            "360122014004GB00091F00080023",
+            "360122014004GB00091F00080024",
+            "360122014004GB00091F00050001",
+            "360122014004GB00091F00050009",
+            "360122014004GB00091F00050008",
+            "360122014004GB00091F00050005",
+            "360122014004GB00091F00050004",
+            "360122014004GB00091F00050018",
+            "360122014004GB00091F00050010",
+            "360122014004GB00091F00050013",
+            "360122014004GB00091F00050012",
+            "360122014004GB00091F00050002",
+            "360122014004GB00091F00050017",
+            "360122014004GB00091F00050015",
+            "360122014004GB00091F00050014",
+            "360122014004GB00091F00050011",
+            "360122014004GB00091F00090035",
+            "360122014004GB00091F00090032",
+            "360122014004GB00091F00090018",
+            "360122014004GB00091F00090019",
+            "360122014004GB00091F00090020",
+            "360122014004GB00091F00090021",
+            "360122014004GB00091F00090026",
+            "360122014004GB00091F00090027",
+            "360122014004GB00091F00090028",
+            "360122014004GB00091F00090029",
+            "360122014004GB00091F00090030",
+            "360122014004GB00091F00090036",
+            "360122014004GB00091F00090033",
+            "360122014004GB00091F00090004",
+            "360122014004GB00091F00090005",
+            "360122014004GB00091F00090006",
+            "360122014004GB00091F00090007",
+            "360122014004GB00091F00090009",
+            "360122014004GB00091F00090010",
+            "360122014004GB00091F00090011",
+            "360122014004GB00091F00090013",
+            "360122014004GB00091F00090031",
+            "360122014004GB00091F00090014",
+            "360122014004GB00091F00090023",
+            "360122014004GB00091F00090016",
+            "360122014004GB00091F00090017",
+            "360122014004GB00091F00120046",
+            "360122014004GB00091F00120033",
+            "360122014004GB00091F00120034",
+            "360122014004GB00091F00120035",
+            "360122014004GB00091F00120036",
+            "360122014004GB00091F00120050",
+            "360122014004GB00091F00120038",
+            "360122014004GB00091F00120039",
+            "360122014004GB00091F00120040",
+            "360122014004GB00091F00120041",
+            "360122014004GB00091F00120042",
+            "360122014004GB00091F00120045",
+            "360122014004GB00091F00120025",
+            "360122014004GB00091F00120026",
+            "360122014004GB00091F00120008",
+            "360122014004GB00091F00120010",
+            "360122014004GB00091F00120013",
+            "360122014004GB00091F00120014",
+            "360122014004GB00091F00120015",
+            "360122014004GB00091F00120016",
+            "360122014004GB00091F00120018",
+            "360122014004GB00091F00120019",
+            "360122014004GB00091F00120021",
+            "360122014004GB00091F00120022",
+            "360122014004GB00091F00120023",
+            "360122014004GB00091F00120024",
+            "360122014004GB00091F00120049",
+            "360122014004GB00091F00120048",
+            "360122014004GB00091F00120002",
+            "360122014004GB00091F00120003",
+            "360122014004GB00091F00120005",
+            "360122014004GB00091F00120006",
+            "360122014004GB00091F00120007",
+            "360122014004GB00091F00120001",
+            "360122014004GB00091F00120027",
+            "360122014004GB00091F00120029",
+            "360122014004GB00091F00120047",
+            "360122014003GB62303F00060007",
+            "360122014003GB62303F00060008",
+            "360122014003GB62303F00060011",
+            "360122014003GB62303F00060013",
+            "360122014003GB62303F00060014",
+            "360122014003GB62303F00060016",
+            "360122014003GB62303F00060017",
+            "360122014003GB62303F00060022",
+            "360122014003GB62303F00060024",
+            "360122014003GB62303F00060002",
+            "360122014003GB62303F00060003",
+            "360122014003GB62303F00060001",
+            "360122014003GB62303F00120003",
+            "360122014003GB62303F00120001",
+            "360122014003GB62303F00100002",
+            "360122014003GB62303F00070004",
+            "360122014003GB62303F00070003",
+            "360122014004GB00091F00020067",
+            "360122014004GB00091F00020035",
+            "360122014004GB00091F00020041",
+            "360122014004GB00091F00020033",
+            "360122014004GB00091F00020032",
+            "360122014004GB00091F00020083",
+            "360122014004GB00091F00020038",
+            "360122014004GB00091F00020039",
+            "360122014004GB00091F00020040",
+            "360122014004GB00091F00020063",
+            "360122014004GB00091F00020064",
+            "360122014004GB00091F00020078",
+            "360122014004GB00091F00020077",
+            "360122014004GB00091F00020002",
+            "360122014004GB00091F00020027",
+            "360122014004GB00091F00020022",
+            "360122014004GB00091F00020026",
+            "360122014004GB00091F00020047",
+            "360122014004GB00091F00020068",
+            "360122014004GB00091F00020003",
+            "360122014004GB00091F00020006",
+            "360122014004GB00091F00020007",
+            "360122014004GB00091F00020009",
+            "360122014004GB00091F00020073",
+            "360122014004GB00091F00020010",
+            "360122014004GB00091F00020076",
+            "360122014004GB00091F00020013",
+            "360122014004GB00091F00020074",
+            "360122014004GB00091F00020042",
+            "360122014004GB00091F00020069",
+            "360122014004GB00091F00020070",
+            "360122014004GB00091F00020015",
+            "360122014004GB00091F00020017",
+            "360122014004GB00091F00020023",
+            "360122014004GB00091F00020024",
+            "360122014004GB00091F00020025",
+            "360122014004GB00091F00020057",
+            "360122014004GB00091F00020059",
+            "360122014004GB00091F00020060",
+            "360122014004GB00091F00020061",
+            "360122014004GB00091F00020052",
+            "360122014004GB00091F00020053",
+            "360122014004GB00091F00020044",
+            "360122014004GB00091F00020045",
+            "360122014004GB00091F00020048",
+            "360122014004GB00091F00020054",
+            "360122014004GB00091F00020055",
+            "360122014003GB62303F00020006",
+            "360122014003GB62303F00020010",
+            "360122014003GB62303F00020011",
+            "360122014003GB62303F00020012",
+            "360122014003GB62303F00020013",
+            "360122014003GB62303F00020003",
+            "360122014003GB62303F00020017",
+            "360122014003GB62303F00020001",
+            "360122014003GB62303F00020002",
+            "360122014003GB62303F00020031",
+            "360122014003GB62303F00020024",
+            "360122014003GB62303F00020030",
+            "360122014003GB62303F00020027",
+            "360122014003GB62303F00020036",
+            "360122014003GB62303F00020019",
+            "360122014003GB62303F00020034",
+            "360122014003GB62303F00020035",
+            "360122014003GB62303F00020022",
+            "360122014003GB62303F00020007",
+            "360122014003GB62303F00020004",
+            "360122014003GB62303F00020005",
+            "360122014003GB62303F00020008",
+            "360122014003GB62303F00020028",
+            "360122014003GB62303F00020009",
+            "360122014004GB00091F00040014",
+            "360122014004GB00091F00040002",
+            "360122014004GB00091F00040020",
+            "360122014004GB00091F00040025",
+            "360122014004GB00091F00040013",
+            "360122014004GB00091F00040019",
+            "360122014004GB00091F00040034",
+            "360122014004GB00091F00040028",
+            "360122014004GB00091F00040021",
+            "360122014004GB00091F00040035",
+            "360122014004GB00091F00040036",
+            "360122014004GB00091F00040001",
+            "360122014004GB00091F00040003",
+            "360122014004GB00091F00040004",
+            "360122014004GB00091F00040031",
+            "360122014004GB00091F00040009",
+            "360122014004GB00091F00040032",
+            "360122014004GB00091F00040033",
+            "360122014004GB00091F00040012",
+            "360122014004GB00091F00040011",
+            "360122014004GB00091F00030005",
+            "360122014004GB00091F00030007",
+            "360122014004GB00091F00030004",
+            "360122014004GB00091F00030012",
+            "360122014004GB00091F00030014",
+            "360122014004GB00091F00030015",
+            "360122014004GB00091F00030016",
+            "360122014004GB00091F00030017",
+            "360122014004GB00091F00100014",
+            "360122014004GB00091F00100015",
+            "360122014004GB00091F00100018",
+            "360122014004GB00091F00100017",
+            "360122014004GB00091F00100016",
+            "360122014004GB00091F00100013",
+            "360122014004GB00091F00100011",
+            "360122014004GB00091F00100010",
+            "360122014004GB00091F00100009",
+            "360122014004GB00091F00100008",
+            "360122014004GB00091F00100007",
+            "360122014004GB00091F00100006",
+            "360122014004GB00091F00100005",
+            "360122014004GB00091F00100002",
+            "360122014004GB00091F00060023",
+            "360122014004GB00091F00060008",
+            "360122014004GB00091F00060012",
+            "360122014004GB00091F00060013",
+            "360122014004GB00091F00060014",
+            "360122014004GB00091F00060019",
+            "360122014004GB00091F00060015",
+            "360122014004GB00091F00060017",
+            "360122014004GB00091F00060007",
+            "360122014004GB00091F00060003",
+            "360122014004GB00091F00060028",
+            "360122014004GB00091F00060036",
+            "360122014004GB00091F00060022",
+            "360122014004GB00091F00060021",
+            "360122014004GB00091F00060020",
+            "360122014004GB00091F00060001",
+            "360122014004GB00091F00060033",
+            "360122014004GB00091F00060031",
+            "360122014004GB00091F00060004",
+            "360122014004GB00091F00060025",
+            "360122014004GB00091F00060024",
+            "360122014004GB00091F00070011",
+            "360122014004GB00091F00070004",
+            "360122014004GB00091F00070015",
+            "360122014004GB00091F00070016",
+            "360122014004GB00091F00070017",
+            "360122014004GB00091F00070018",
+            "360122014004GB00091F00070007",
+            "360122014004GB00091F00070008",
+            "360122014004GB00091F00070005",
+            "360122014004GB00091F00070006",
+            "360122014004GB00091F00070003",
+            "360122014004GB00091F00070001",
+            "360122014004GB00091F00070002",
+            "360122014004GB00091F00010046",
+            "360122014004GB00091F00010061",
+            "360122014004GB00091F00010067",
+            "360122014004GB00091F00010070",
+            "360122014004GB00091F00010051",
+            "360122014004GB00091F00010064",
+            "360122014004GB00091F00010066",
+            "360122014004GB00091F00010057",
+            "360122014004GB00091F00010090",
+            "360122014004GB00091F00010033",
+            "360122014004GB00091F00010034",
+            "360122014004GB00091F00010053",
+            "360122014004GB00091F00010027",
+            "360122014004GB00091F00010049",
+            "360122014004GB00091F00010048",
+            "360122014004GB00091F00010084",
+            "360122014004GB00091F00010036",
+            "360122014004GB00091F00010059",
+            "360122014004GB00091F00010054",
+            "360122014004GB00091F00010013",
+            "360122014004GB00091F00010097",
+            "360122014004GB00091F00010098",
+            "360122014004GB00091F00010100",
+            "360122014004GB00091F00010020",
+            "360122014004GB00091F00010019",
+            "360122014004GB00091F00010002",
+            "360122014004GB00091F00010003",
+            "360122014004GB00091F00010022",
+            "360122014004GB00091F00010058",
+            "360122014004GB00091F00010071",
+            "360122014004GB00091F00010091",
+            "360122014004GB00091F00010031",
+            "360122014004GB00091F00010032",
+            "360122014004GB00091F00010086",
+            "360122014004GB00091F00010088",
+            "360122014004GB00091F00010025",
+            "360122014004GB00091F00010017",
+            "360122014004GB00091F00010052",
+            "360122014004GB00091F00010068",
+            "360122014004GB00091F00010069",
+            "360122014004GB00091F00010080",
+            "360122014004GB00091F00010073",
+            "360122014004GB00091F00010045",
+            "360122014004GB00091F00010040",
+            "360122014004GB00091F00010007",
+            "360122014004GB00091F00010015",
+            "360122014004GB00091F00010096",
+            "360122014004GB00091F00010062",
+            "360122014004GB00091F00010050",
+            "360122014004GB00091F00010078",
+            "360122014004GB00091F00010085",
+            "360122014004GB00091F00010014",
+            "360122014004GB00091F00010075",
+            "360122014004GB00091F00010018",
+            "360122014004GB00091F00010082",
+            "360122014003GB62303F00160003",
+            "360122014003GB62303F00080004",
+            "360122014003GB62303F00080003",
+            "360122014003GB62303F00080001",
+            "360122014003GB62303F00090004",
+            "360122014003GB62303F00090002",
+            "360122014003GB62303F00170003",
+            "360122014003GB62303F00170004",
+            "360122014003GB62303F00170001",
+            "360122014003GB62303F00030066",
+            "360122014003GB62303F00030073",
+            "360122014003GB62303F00030075",
+            "360122014003GB62303F00030079",
+            "360122014003GB62303F00030080",
+            "360122014003GB62303F00030081",
+            "360122014003GB62303F00030007",
+            "360122014003GB62303F00030008",
+            "360122014003GB62303F00030001",
+            "360122014003GB62303F00030082",
+            "360122014003GB62303F00030089",
+            "360122014003GB62303F00030090",
+            "360122014003GB62303F00030091",
+            "360122014003GB62303F00030004",
+            "360122014003GB62303F00030010",
+            "360122014003GB62303F00030011",
+            "360122014003GB62303F00030012",
+            "360122014003GB62303F00030013",
+            "360122014003GB62303F00030014",
+            "360122014003GB62303F00030016",
+            "360122014003GB62303F00030018",
+            "360122014003GB62303F00030060",
+            "360122014003GB62303F00030061",
+            "360122014003GB62303F00030069",
+            "360122014003GB62303F00030071",
+            "360122014003GB62303F00030072",
+            "360122014003GB62303F00030023",
+            "360122014003GB62303F00030024",
+            "360122014003GB62303F00030025",
+            "360122014003GB62303F00030026",
+            "360122014003GB62303F00030027",
+            "360122014003GB62303F00030029",
+            "360122014003GB62303F00030036",
+            "360122014003GB62303F00030031",
+            "360122014003GB62303F00030043",
+            "360122014003GB62303F00030039",
+            "360122014003GB62303F00030042",
+            "360122014003GB62303F00030051",
+            "360122014003GB62303F00030045",
+            "360122014003GB62303F00030052",
+            "360122014003GB62303F00030048",
+            "360122014003GB62303F00030053",
+            "360122014003GB62303F00030056",
+            "360122014003GB62303F00030058",
+            "360122014003GB62303F00110001",
+            "360122014003GB62303F00110004",
+            "360122014003GB62303F00110003",
+            "360122014003GB62303F00110002",
+            "360122014003GB62303F00010004",
+            "360122014003GB62303F00010011",
+            "360122014003GB62303F00010012",
+            "360122014003GB62303F00010014",
+            "360122014003GB62303F00010015",
+            "360122014003GB62303F00010020",
+            "360122014003GB62303F00010016",
+            "360122014003GB62303F00010005",
+            "360122014003GB62303F00010006",
+            "360122014003GB62303F00010007",
+            "360122014003GB62303F00010008",
+            "360122014003GB62303F00010028",
+            "360122014003GB62303F00010031",
+            "360122014003GB62303F00010032",
+            "360122014003GB62303F00010033",
+            "360122014003GB62303F00010034",
+            "360122014003GB62303F00010036",
+            "360122014003GB62303F00010039",
+            "360122014003GB62303F00010041",
+            "360122014003GB62303F00010042",
+            "360122014003GB62303F00010045",
+            "360122014003GB62303F00010047",
+            "360122014003GB62303F00010048",
+            "360122014003GB62303F00010049",
+            "360122014003GB62303F00010050",
+            "360122014003GB62303F00010051",
+            "360122014003GB62303F00010053",
+            "360122014003GB62303F00010054",
+            "360122014003GB62303F00010056",
+            "360122014003GB62303F00010060",
+            "360122014003GB62303F00010061",
+            "360122014003GB62303F00010003",
+            "360122014003GB62303F00010001",
+            "360122014003GB62303F00010002",
+            "360122014003GB62303F00010009",
+            "360122014003GB62303F00010027",
+            "360122014003GB62303F00010022",
+            "360122014003GB62303F00010023",
+            "360122014003GB62303F00010024",
+            "360122014003GB62303F00010025",
+            "360122014003GB62303F00010010",
+            "360122014003GB62302F00080002",
+            "360122011002GB00318F99960001",
+            "360122011002GB00318F99990001",
+            "360122011002GB00318F99980001",
+            "360122011002GB00318F99970001",
+            "360122009006GB60181F99920001",
+            "360122009006GB60181F99960001",
+            "360122009006GB60181F99890001",
+            "360122009006GB60181F99900001",
+            "360122009006GB60181F99940001",
+            "360122009006GB60181F99980001",
+            "360122009006GB60181F99880001",
+            "360122009006GB60181F99910001",
+            "360122009006GB60181F99990001",
+            "360122009006GB60181F99970001",
+            "360122009006GB60181F99950001",
+            "360122014005GB00046F00070015",
+            "360122014005GB00046F00070006",
+            "360122014005GB00046F00070012",
+            "360122014005GB00046F00070002",
+            "360122014005GB00046F00070010",
+            "360122014005GB00046F00070001",
+            "360122014005GB00046F00070016",
+            "360122014005GB00046F00070014",
+            "360122014005GB00046F00080014",
+            "360122014005GB00046F00080015",
+            "360122014005GB00046F00080010",
+            "360122014005GB00046F00080012",
+            "360122014005GB00046F00080008",
+            "360122014005GB00046F00080005",
+            "360122014005GB00046F00080011",
+            "360122014005GB00046F00080016",
+            "360122014005GB00046F00080001",
+            "360122014005GB00046F00080017",
+            "360122011003GB00332F00010022",
+            "360122011006GB00318F00010001",
+            "360122011006GB00012F00020070",
+            "360122011006GB00305F00360078",
+            "360122011009GB00309F00110017",
+            "360122011009GB00309F00110018",
+            "360122011009GB00309F00110019",
+            "360122011009GB00309F00110011",
+            "360122011009GB00309F00110012",
+            "360122011009GB00309F00110030",
+            "360122011009GB00309F00110020",
+            "360122011009GB00309F00110021",
+            "360122011009GB00309F00110022",
+            "360122011009GB00309F00110023",
+            "360122011009GB00309F00110024",
+            "360122011009GB00309F00110031",
+            "360122011009GB00309F00110013",
+            "360122011009GB00309F00110032",
+            "360122011009GB00309F00110025",
+            "360122011009GB00309F00110026",
+            "360122011009GB00309F00110027",
+            "360122011009GB00309F00110028",
+            "360122011009GB00309F00110029",
+            "360122011009GB00309F00110045",
+            "360122011009GB00309F00110046",
+            "360122011009GB00309F00110047",
+            "360122011009GB00309F00110048",
+            "360122011009GB00309F00110049",
+            "360122011009GB00309F00110033",
+            "360122011009GB00309F00110034",
+            "360122011009GB00309F00110035",
+            "360122011009GB00309F00110036",
+            "360122011009GB00309F00110043",
+            "360122011009GB00309F00110044",
+            "360122011009GB00309F00110037",
+            "360122011009GB00309F00110038",
+            "360122011009GB00309F00110039",
+            "360122011009GB00309F00110041",
+            "360122011009GB00309F00110042",
+            "360122011009GB00309F00110050",
+            "360122011009GB00309F00110051",
+            "360122011009GB00309F00110040",
+            "360122011009GB00309F00110060",
+            "360122011009GB00309F00110061",
+            "360122011009GB00309F00110056",
+            "360122011009GB00309F00110057",
+            "360122011009GB00309F00110058",
+            "360122011009GB00309F00110059",
+            "360122011009GB00309F00110062",
+            "360122011009GB00309F00110063",
+            "360122011009GB00309F00110065",
+            "360122011009GB00309F00110066",
+            "360122011009GB00309F00110067",
+            "360122011009GB00309F00110068",
+            "360122011009GB00309F00110069",
+            "360122011009GB00309F00110070",
+            "360122011009GB00309F00110071",
+            "360122011009GB00309F00110072",
+            "360122011009GB00309F00110064",
+            "360122011009GB00309F00110005",
+            "360122011009GB00309F00110006",
+            "360122011009GB00309F00110007",
+            "360122011009GB00309F00110008",
+            "360122011009GB00309F00110009",
+            "360122011009GB00309F00110010",
+            "360122011009GB00309F00110054",
+            "360122011009GB00309F00110052",
+            "360122011009GB00309F00110053",
+            "360122011009GB00309F00110055",
+            "360122011009GB00309F00110015",
+            "360122011009GB00309F00110014",
+            "360122011009GB00309F00110016",
+            "360122011004GB00357F00280109",
+            "360122011009GB00309F00030066",
+            "360122011009GB00309F00030090",
+            "360122011009GB00309F00030089",
+            "360122011009GB00309F00030047",
+            "360122011009GB00309F00030107",
+            "360122011009GB00309F00030102",
+            "360122011009GB00309F00030101",
+            "360122011009GB00309F00030093",
+            "360122011009GB00309F00030087",
+            "360122011009GB00309F00020042",
+            "360122011009GB00309F00020043",
+            "360122011009GB00309F00020053",
+            "360122011009GB00309F00020039",
+            "360122011009GB00309F00020035",
+            "360122011009GB00309F00020011",
+            "360122011009GB00309F00020051",
+            "360122011009GB00309F00020047",
+            "360122011009GB00309F00020031",
+            "360122011009GB00309F00020030",
+            "360122011009GB00309F00020029",
+            "360122011009GB00309F00020027",
+            "360122011009GB00309F00020002",
+            "360122011009GB00309F00020004",
+            "360122011009GB00309F00010018",
+            "360122011009GB00309F00010014",
+            "360122011009GB00309F00010037",
+            "360122011009GB00309F00010024",
+            "360122011009GB00309F00010040",
+            "360122009006GB60106F99950001",
+            "360122009006GB60106F99960001",
+            "360122009006GB60106F99980001",
+            "360122009006GB60106F99920001",
+            "360122009006GB60106F99970001",
+            "360122009006GB60106F99910001",
+            "360122009006GB60106F99940001",
+            "360122009006GB60106F99990001",
+            "360122009006GB60106F99930001",
+            "360122011006GB00305F00360037",
+            "360122014004GB00093F00030086",
+            "360122014004GB00093F00030091",
+            "360122014003GB62302F00080029",
+            "360122014005GB00046F00060046",
+            "360122014005GB00046F00060019",
+            "360122014005GB00046F00060008",
+            "360122014005GB00046F00060014",
+            "360122014005GB00046F00060018",
+            "360122014005GB00046F00060028",
+            "360122014005GB00046F00060049",
+            "360122011006GB00305F00030146",
+            "360122011003GB00332F00130018"
+    );
+
+
+
 }

+ 21 - 11
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/JsydghxkController.java

@@ -4,17 +4,20 @@ import com.siwei.apply.domain.NodeLand;
 import com.siwei.apply.domain.res.JsydghxkRes;
 import com.siwei.apply.domain.vo.JsydghxkUpdateVo;
 import com.siwei.apply.domain.vo.JsydghxkVo;
+import com.siwei.apply.domain.vo.OnChainVo;
 import com.siwei.apply.service.JsydghxkService;
 import com.siwei.apply.service.LandOneCodeService;
 import com.siwei.apply.service.NodeLandService;
 import com.siwei.apply.service.ProjectService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -97,27 +100,34 @@ public class JsydghxkController extends BaseController {
         }
     }
 
+
     /**
      * 更新建设用地规划许可的上链状态
      */
     @PutMapping("/onchain")
-    public R<Void> updateHasOnchain(@RequestBody Map<String, Object> params) {
+    public R<Void> updateHasOnchain(@RequestBody OnChainVo onChainVo) {
         try {
-            String id = (String) params.get("id");
-            String projectId = (String) params.get("projectId");
-            Boolean hasOnchain = (Boolean) params.get("hasOnchain");
-            if (StringUtils.isBlank(id)) {
-                return R.fail("nodeId不能为空");
+            List<String> ids = onChainVo.getIds();
+            String projectId = onChainVo.getProjectId();
+            Boolean hasOnchain = onChainVo.getHasOnchain();
+            if (CollectionUtils.isEmpty(ids)) {
+                return R.fail(502, "节点为空,确保基本数据填写完毕");
+            }
+            for (String id : onChainVo.getIds()) {
+                NodeLand nodeLand = nodeLandService.getNodeLandByNodeId(id);
+                if (Objects.isNull(nodeLand)) {
+                    return R.fail(502, "数据空间信息不存在,请检查先导入空间数据");
+                }
             }
-            NodeLand nodeLand = nodeLandService.getNodeLandByNodeId(id);
-            if(Objects.isNull(nodeLand)){
-                return R.fail(502,"数据空间信息不存在,请检查先导入空间数据");
+            for (String id : onChainVo.getIds()) {
+                jsydghxkService.updateHasOnchain(id, hasOnchain);
             }
-            jsydghxkService.updateHasOnchain(id, hasOnchain);
             // 更新项目表的上链数量
             projectService.countOnChinaNum(projectId);
             //这里生成资源吗
-            landOneCodeService.addOrUpdateLandOneCodeInfo(projectId,id);
+            for (String id : onChainVo.getIds()) {
+                landOneCodeService.addOrUpdateLandOneCodeInfo(projectId,id);
+            }
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

+ 7 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/ThematicController.java

@@ -3,6 +3,7 @@ package com.siwei.apply.controller;
 
 import com.siwei.apply.service.*;
 import com.siwei.common.core.domain.R;
+import com.siwei.common.core.utils.StringUtils;
 import com.siwei.common.core.web.controller.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -91,6 +92,12 @@ public class ThematicController extends BaseController {
     @PostMapping("/launchLand")
     public R<Object> launchLand(String name, String ztry, String ztdw,String fwlx,String bh) {
         try {
+            if(StringUtils.isBlank(ztry)){
+                ztry = "未知";
+            }
+            if(StringUtils.isBlank(ztdw)){
+                ztdw = "未知";
+            }
             R<Object> res = thematicService.launchLand(name, ztry,ztdw,fwlx,bh);
             return res;
         } catch (Exception e) {

+ 4 - 5
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/ParcelAnalysisController.java

@@ -85,9 +85,9 @@ public class ParcelAnalysisController extends BaseController {
      * @return ZdqlReportVO 含列头定义、各地籍子区数据行、合计行
      */
     @GetMapping("/report/zdql")
-    public R<ZdqlReportVO> getZdqlReport() {
+    public R<ZdqlReportVO> getZdqlReport(@RequestParam(value = "landRightType", required = true) String landRightType) {
         try {
-            ZdqlReportVO res = parcelService.getZdqlReport();
+            ZdqlReportVO res = parcelService.getZdqlReport(landRightType);
             return R.ok(res);
         } catch (Exception e) {
             e.printStackTrace();
@@ -95,7 +95,6 @@ public class ParcelAnalysisController extends BaseController {
         }
     }
 
-
     /**
      * 导出宗地权利报表(Excel格式)
      * 表格结构:
@@ -106,9 +105,9 @@ public class ParcelAnalysisController extends BaseController {
      *   - 末行:合计行
      */
     @PostMapping("/zdql/export")
-    public void exportZdqlReport(HttpServletResponse response) {
+    public void exportZdqlReport(HttpServletResponse response,@RequestParam(value = "landRightType",required = true) String landRightType) {
         try {
-            ZdqlReportVO res = parcelService.getZdqlReport();
+            ZdqlReportVO res = parcelService.getZdqlReport(landRightType);
             if (res == null) {
                 return;
             }

+ 99 - 4
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/third/DealExcelController.java

@@ -5,6 +5,7 @@ import com.siwei.apply.service.third.impl.DealExcelServiceImpl;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -33,6 +34,102 @@ public class DealExcelController extends BaseController {
     @Autowired
     DealExcelServiceImpl  dealExcelService;
 
+
+
+    @GetMapping("testData/{fileName}")
+    public R<List<Map<String,String>>> testDealData(@PathVariable String fileName) {
+        try {
+            String uploadFile = Constant.IMPORT_EXCEL_DATA_FILE_PATH + "\\" + fileName;
+            Path filePath = Paths.get(uploadFile);
+            File file = filePath.toFile();
+            Map<String, List<Map<String, String>>> excelDataMap = readExcelWithMergedHeaders(file);
+            List<Map<String, String>> tdgyShpOfZdList = dealExcelService.testDealData(excelDataMap);
+            return R.ok(tdgyShpOfZdList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.fail(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 获取土地供应对应的矢量数据,在地表宗地中对应的ywh,和不动产单元号
+     * 这里遍历循环关于list   (4.projectId , 不动产单元号,业务号。)
+     * @return
+     */
+    @GetMapping("tdgyShpDealOfLand/{fileName}")
+    public R<List<Map<String,String>>> getTdgyShpOfZdShpContainsOfLand(@PathVariable String fileName) {
+        try {
+            List<Map<String, String>> tdgyShpOfZdList = dealExcelService.getTdgyShpOfZdShpContains();
+            if (CollectionUtils.isNotEmpty(tdgyShpOfZdList)) {
+                String uploadFile = Constant.IMPORT_EXCEL_DATA_FILE_PATH + "\\" + fileName;
+                Path filePath = Paths.get(uploadFile);
+                File file = filePath.toFile();
+                Map<String, List<Map<String, String>>> excelDataMap = readExcelWithMergedHeaders(file);
+                tdgyShpOfZdList = dealExcelService.getBusinessCodeFromExcel(tdgyShpOfZdList, excelDataMap);
+
+                //这里进行数据入库处理,直接根据业务号,和项目id去抓取不动产的附件信息并且增加节点:
+                dealExcelService.addBDCDataAndAttachment(tdgyShpOfZdList,1);
+            }
+            return R.ok(tdgyShpOfZdList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.fail(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 获取土地供应对应的矢量数据,在地表宗地中对应的ywh,和不动产单元号
+     * 这里遍历循环关于list   (4.projectId , 不动产单元号,业务号。)
+     * @return
+     */
+    @GetMapping("tdgyShpDealOfHouse/{fileName}")
+    public R<List<Map<String,String>>> getTdgyShpOfZdShpContainsOfHouse(@PathVariable String fileName) {
+        try {
+            List<Map<String, String>> tdgyShpOfZdList = dealExcelService.getTdgyShpOfZdShpContains();
+            if (CollectionUtils.isNotEmpty(tdgyShpOfZdList)) {
+                String uploadFile = Constant.IMPORT_EXCEL_DATA_FILE_PATH + "\\" + fileName;
+                Path filePath = Paths.get(uploadFile);
+                File file = filePath.toFile();
+                Map<String, List<Map<String, String>>> excelDataMap = readExcelWithMergedHeaders(file);
+                tdgyShpOfZdList = dealExcelService.getBusinessCodeFromExcelOfHouse(tdgyShpOfZdList, excelDataMap);
+
+                //这里进行数据入库处理,直接根据业务号,和项目id去抓取不动产的附件信息并且增加节点:
+                dealExcelService.addBDCDataAndAttachment(tdgyShpOfZdList,2);
+            }
+            return R.ok(tdgyShpOfZdList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.fail(e.getMessage());
+        }
+    }
+
+
+
+
+    /**
+     * 处理excel数据(按合并列头分组读取)  v3
+     */
+    @GetMapping("excelDeal_v3/{fileName}")
+    public R<Map<String, List<Map<String,String>>>> excelDeal_v3(@PathVariable String fileName) {
+        try {
+            String uploadFile = Constant.IMPORT_EXCEL_DATA_FILE_PATH+"\\"+fileName;
+            Path filePath = Paths.get(uploadFile);
+            File file = filePath.toFile();
+            Map<String, List<Map<String, String>>> dataMap = readExcelWithMergedHeaders(file);
+
+            String res = dealExcelService.addExcelDataToDb_V3(dataMap);
+            logger.info("新增数据结果{}",res);
+
+            return R.ok(dataMap);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.fail(e.getMessage());
+        }
+    }
+
+
     /**
      * 不动产数据下载
      */
@@ -54,8 +151,6 @@ public class DealExcelController extends BaseController {
 
 
 
-
-
     /**
      * 处理excel数据,批次报批数据
      */
@@ -91,8 +186,8 @@ public class DealExcelController extends BaseController {
 //            String res = dealExcelService.checkExcelDataToDb(dataMap);
 //            logger.info("检查数据结果{}",res);
 
-
-            String res = dealExcelService.addExcelDataToDb(dataMap);
+            //String res = dealExcelService.addExcelDataToDb(dataMap);
+            String res = "";
             logger.info("新增数据结果{}",res);
 
 //            for (Map.Entry<String, List<Map<String, String>>> entry : dataMap.entrySet()) {

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Gyjsydscdj.java

@@ -26,6 +26,7 @@ public class Gyjsydscdj extends BaseId{
     private String bdczh;          // 不动产证号
     private String djjg;           // 登记结构
     private String djDate;           // 登记日期
+    private String bz;               // 备注(数据清单)
     private Map<String, Object> attachment; // 附件
     private Boolean hasOnchain;     // 是否上链(布尔)
     private String creatorId;      // 创建人ID

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Jsgcghxk.java

@@ -20,6 +20,7 @@ public class Jsgcghxk extends BaseId {
     private String fzjg; // 发证机关
 
     private String fzDate; // 发证日期
+    private String bz; // 备注(数据清单)
     private String attachment; // 附件
     private Boolean hasOnchain; // 是否上链
     private String creatorId; // 创建人ID

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Jsydghxk.java

@@ -23,6 +23,7 @@ public class Jsydghxk extends BaseId {
     private String zsbh;               // 证书编号
     private String fzjg;               // 发证机关
     private String fzDate;               // 发证日期
+    private String bz;                   // 备注(数据清单)
     private Map<String, Object> attachment; // 附件
     private Boolean hasOnchain;        // 是否上链
     private String creatorId;          // 创建人ID

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Tdgy.java

@@ -22,6 +22,7 @@ public class Tdgy extends BaseId {
     private String hbcrfapfwh;     // 用地划拨/出让方案批复文号
     private String hbcrhtbh;       // 划拨决定书/出让合同编号
     private String hbcrhtDate;       // 划拨决定书/出让合同日期
+    private String bz;               // 备注(数据清单)
     private Map<String, Object> attachment;     // 附件
     private Boolean hasOnchain;    // 是否上链
     private String creatorId;      // 创建人ID

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Tdhyhs.java

@@ -23,6 +23,7 @@ public class Tdhyhs extends BaseId {
     private String gljsgcghxkh;         // 关联建设工程规划许可号
     // 新增字段
     private String hyyj;                // 审核意见
+    private String bz;                  // 备注(数据清单)
 
     private Boolean hasOnchain;         // 是否上链
     private String creatorId;           // 创建人ID

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Tjyydhx.java

@@ -19,6 +19,7 @@ public class Tjyydhx extends BaseId {
     private String cjbh;           // 出具编号
     private String cjDate;           // 出具日期
     private String cjyj;           // 出具意见
+    private String bz;             // 备注(数据清单)
     private String creatorId;      // 创建人ID
     private Boolean hasOnchain;    // 是否上链
 

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Ydbp.java

@@ -20,6 +20,7 @@ public class Ydbp extends BaseId {
     private String bpDate;//报批日期
     private String pfwh;//批复文号
     private String pfDate;//批复日期
+    private String bz;//备注(数据清单)
     private Map<String, Object> attachment; // 存储附件的目录树
     private Boolean hasOnchain;//是否上链
     private String creatorId; // 创建人ID

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/YdbpData.java

@@ -19,6 +19,7 @@ public class YdbpData extends BaseId {
     private String bpDate;
     private String pfwh;
     private String pfDate;
+    private String bz;
     private String creatorId;
     private Boolean hasOnchain;    // 是否上链
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Ydysyxz.java

@@ -21,6 +21,7 @@ public class Ydysyxz extends BaseId {
     private String xmjsyj;//项目建设依据
     private String zzwh;//证书文号
     private String fzDate;//发证日期
+    private String bz;//备注(数据清单)
     // JSONB 对应 Java 的 Map 或自定义对象
     private Map<String, Object> attachment;//存储附件的目录树
     private Boolean hasOnchain = false;//是否上链

+ 36 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/cadastre/Zdbhqk.java

@@ -0,0 +1,36 @@
+package com.siwei.apply.domain.cadastre;
+
+import lombok.Data;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 不动产权属变更申请表 ZDBHQK
+ */
+@Data
+public class Zdbhqk {
+    /** 不动产单元号 */
+    private String bdcdyh;
+    /** 宗地代码 */
+    private String zddm;
+    /** 变更原因 */
+    private String bhyy;
+    /** 变更内容 */
+    private String bhnr;
+    /** 变更日期 */
+    private Date bhsj;
+    /** 登记日期 */
+    private Date djsj;
+    /** 变更前宗地代码 */
+    private String bhqzddm;
+    /** 业务编号 */
+    private String ywh;
+    /** 登记备案人 */
+    private String dbr;
+    /** 申请业务编号 */
+    private String ssywh;
+    /** 附件 */
+    private String fj;
+    /** 有效标识:0-当前版本,1-历史版本 */
+    private Integer validFlag;
+}

+ 5 - 1
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/FwmxVo.java

@@ -7,6 +7,7 @@ import java.util.Date;
 
 /**
  * 房屋首次登记明细 视图对象
+ * 开发单位对应的就是权利人字段;不动产没有告知单盖章时间,你们可以用djsj时间作为告知时间
  */
 @Data
 public class FwmxVo {
@@ -25,4 +26,7 @@ public class FwmxVo {
     private String bdcdyh;         // 不动产单元号
     private String bdcqzh;         // 不动产权证号
     private String zl;             // 坐落
-}
+    private String qlr;             // 权利人
+    private String djrq;             // 登记日期
+}
+

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/GyjsydscdjVo.java

@@ -20,5 +20,6 @@ public class GyjsydscdjVo {
     private String bdczh;          // 不动产证号
     private String djjg;           // 登记结构
     private String djDate;         // 登记日期
+    private String bz;             // 备注(数据清单)
     private String sourceId;       // 来源ID
 }

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/JsgcghxkVo.java

@@ -16,5 +16,6 @@ public class JsgcghxkVo {
     private String zsbh; // 证书编号
     private String fzjg; // 发证机关
     private String fzDate; // 发证日期
+    private String bz; // 备注(数据清单)
     private String sourceId; // 同步表id
 }

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/JsydghxkVo.java

@@ -20,5 +20,6 @@ public class JsydghxkVo {
     private String zsbh;               // 证书编号
     private String fzjg;               // 发证机关
     private String fzDate;               // 发证日期
+    private String bz;                   // 备注(数据清单)
     private String sourceId;            // 同步表id
 }

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/TdgyVo.java

@@ -18,4 +18,5 @@ public class TdgyVo {
     private String hbcrhtbh;       // 划拨决定书/出让合同编号
     private String hbcrhtDate;       // 划拨决定书/出让合同日期
     private String gdUnit;        // 供地单位
+    private String bz;            // 备注(数据清单)
 }

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/TdhyhsVo.java

@@ -15,6 +15,7 @@ public class TdhyhsVo {
     private String jsdw;                // 建设单位
     private String gljsgcghxkh;         // 关联建设工程规划许可号
     private String hyyj;                // 核验意见
+    private String bz;                  // 备注(数据清单)
     private String sourceId;            // 同步表id
 
 }

+ 3 - 1
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/TjyydhxVo.java

@@ -15,5 +15,7 @@ public class TjyydhxVo {
     private String ydwz;           // 用地位置
     private String cjbh;           // 出具编号
     private String cjDate;           // 出具日期
-    private String cjyj;           // 出具意见
+    private String cjyj;           // 出具依据
+    private String bz;             // 备注(数据清单)
+
 }

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/YdbpDataVo.java

@@ -16,4 +16,5 @@ public class YdbpDataVo {
     private String bpDate;
     private String pfwh;
     private String pfDate;
+    private String bz;
 }

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/YdbpVo.java

@@ -19,4 +19,5 @@ public class YdbpVo {
 
     private String ydUnit; // 用地面积单位
     private String zsUnit; // 征收面积单位
+    private String bz; // 备注(数据清单)
 }

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/YdysyxzVo.java

@@ -16,5 +16,6 @@ public class YdysyxzVo {
     private String xmjsyj;//项目建设依据
     private String zzwh;//证书文号
     private String fzDate;//发证日期
+    private String bz;//备注(数据清单)
     private Boolean hasOnchain;//是否上链
 }

+ 8 - 4
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/CadastreFileMapper.java

@@ -74,22 +74,22 @@ public interface CadastreFileMapper {
     int insertTableData(@Param("tableName") String tableName, @Param("data") Map<String, Object> data, @Param("shpDbSRID") Integer shpDbSRID);
 
 
-    String selectGeoms(String tableName);
+    String selectGeoms(@Param("tableName") String tableName,@Param("landRightType") String landRightType);
 
     /**
      * 增加valid_flag字段
      */
     void addValidFlagColumn(@Param("tableName") String tableName);
 
-    void updateValidFlag(@Param("validFlag") String validFlag, @Param("oldValidFlag") String oldValidFlag, @Param("tableName") String tableName);
+    void updateValidFlag(@Param("validFlag") String validFlag, @Param("oldValidFlag") String oldValidFlag,@Param("landRightType") String landRightType, @Param("tableName") String tableName);
 
 
-    void deleteByValidFlag(@Param("validFlag") String validFlag,@Param("tableName") String tableName);
+    void deleteByValidFlag(@Param("validFlag") String validFlag,@Param("landRightType") String landRightType,@Param("tableName") String tableName);
 
 
     Integer countByValidFlag(@Param("validFlag") String validFlag, @Param("tableName") String tableName);
 
-    List<Map<String,Object>> selectTableData(@Param("validFlag") String validFlag, @Param("tableName") String tableName);
+    List<Map<String,Object>> selectTableData(@Param("validFlag") String validFlag,@Param("landRightType") String landRightType, @Param("tableName") String tableName);
 
     Map<String,Object> selectExistsSameData(@Param("validFlag") String validFlag, @Param("data") Map<String, Object> data, @Param("tableName") String tableName);
 
@@ -122,4 +122,8 @@ public interface CadastreFileMapper {
     List<Map<String,Object>> selectQlrList(@Param("name") String name, @Param("validFlag") String validFlag);
 
 
+    List<Map<String,Object>> getIntersectsGeomZdList(@Param("detailsId") String detailsId);
+
+
+
 }

+ 4 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/ProjectMapper.java

@@ -31,6 +31,10 @@ public interface ProjectMapper {
      */
     List<Project> getList(ProjectFilterVo projectFilterVo);
 
+
+    List<Project> getByConditionList(@Param("name") String name ,@Param("code") String code ,@Param("company") String company);
+
+
     /**
      * 获取不分页项目列表
      */

+ 2 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/TdgyMapper.java

@@ -70,6 +70,8 @@ public interface TdgyMapper {
 
     List<Tdgy> getTdgyList(@Param("startYear") String startYear,@Param("endYear") String endYear);
 
+    List<Map<String,String>> getTdgyGeomList();
+
 
 }
 

+ 36 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/cadastre/ZdbhqkMapper.java

@@ -0,0 +1,36 @@
+package com.siwei.apply.mapper.cadastre;
+
+import com.siwei.apply.domain.cadastre.Zdbhqk;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 不动产权属变更申请表 数据层
+ */
+@Mapper
+public interface ZdbhqkMapper {
+
+    /**
+     * 新增不动产权属变更记录
+     */
+    void add(Zdbhqk zdbhqk);
+
+    /**
+     * 根据bdcdyh获取不动产权属变更记录
+     */
+    Zdbhqk get(@Param("bdcdyh") String bdcdyh);
+
+    /**
+     * 获取不动产权属变更记录列表
+     */
+    List<Zdbhqk> getList();
+
+    /**
+     * 更新不动产权属变更记录
+     */
+    void update(Zdbhqk zdbhqk);
+}

+ 17 - 1
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/cadastre/ZdjbxxMapper.java

@@ -42,6 +42,12 @@ public interface ZdjbxxMapper {
      */
     void update(Zdjbxx zdjbxx);
 
+
+    void updateZtByBsmList(@Param("idList") List<Integer> idList);
+
+
+
+
     /**
      * 批量删除宗地基本信息记录
      */
@@ -71,7 +77,7 @@ public interface ZdjbxxMapper {
      * @param qllxCodes 要统计的权利类型代码列表(逗号分隔的字符串,如 '10','11','12','40','20')
      * @return 统计结果列表
      */
-    List<Map<String, Object>> getZdqlReportData(@Param("qllxCodes") List<String> qllxCodes);
+    List<Map<String, Object>> getZdqlReportData(@Param("qllxCodes") List<String> qllxCodes,@Param("landRightType")String landRightType);
 
     /**
      * 按土地用途(一级分类)× 权利性质统计宗地面积(用于宗地用途报表)
@@ -84,4 +90,14 @@ public interface ZdjbxxMapper {
      */
     List<Map<String, Object>> getZdytReportData();
 
+    List<Zdjbxx> selectByContainsWkt(@Param("ewkt") String ewkt,@Param("rightType") String rightType);
+
+    List<Zdjbxx> queryByIntersectList(@Param("wktList") List<String> wktList);
+
+    List<Zdjbxx> selectIntersectByGeom(@Param("ewkt") String ewkt);
+
+    List<Zdjbxx> selectByInvertContainsWkt(@Param("ewkt") String ewkt ,@Param("rightType") String rightType);
+
+
+
 }

+ 1 - 2
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/IParcelService.java

@@ -13,12 +13,11 @@ public interface IParcelService {
 
     List<Zdjbxx> zdList(String djzqdm,String type);
 
-    ZdqlReportVO getZdqlReport();
+    ZdqlReportVO getZdqlReport(String landRightType);
 
     ZdytReportVO getZdytReport();
 
     List<ParcelStatisticsRes.QlxzDTO> getZdqlxzReport();
 
-
 }
 

+ 225 - 25
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/CadastreManageServiceImpl.java

@@ -1,16 +1,23 @@
 package com.siwei.apply.service.cadastre.impl;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.siwei.apply.domain.CadastreFile;
 import com.siwei.apply.domain.LayerAndDbData;
 import com.siwei.apply.domain.MdbAndDbData;
+import com.siwei.apply.domain.cadastre.Zdbhqk;
+import com.siwei.apply.domain.cadastre.Zdjbxx;
 import com.siwei.apply.domain.vo.*;
 import com.siwei.apply.mapper.CadastreFileMapper;
 import com.siwei.apply.mapper.FzssFxrwrzMapper;
+import com.siwei.apply.mapper.cadastre.ZdbhqkMapper;
+import com.siwei.apply.mapper.cadastre.ZdjbxxMapper;
 import com.siwei.apply.service.cadastre.CadastreManageService;
 
 import com.siwei.apply.utils.FileExtractUtil;
 import com.siwei.apply.utils.MdbUtil;
 import com.siwei.common.core.exception.ServiceException;
+import com.siwei.common.core.utils.DateUtils;
+import com.siwei.common.core.utils.bean.BeanUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -31,8 +38,10 @@ import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 /**
@@ -57,6 +66,14 @@ public class CadastreManageServiceImpl implements CadastreManageService {
     @Autowired
     private FzssFxrwrzMapper fzssFxrwrzMapper;
 
+    @Autowired
+    private ZdjbxxMapper zdjbxxMapper;
+
+    @Autowired
+    private ZdbhqkMapper zdbhqkMapper;
+
+
+
     /**
      * 解压文件并且根据情况进行拆分或合并的处理
      * @param  上传文件名
@@ -167,9 +184,136 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                             //throw new ServiceException(name + ":字段数据不一致!-" + dbFieldNameList);
                         }
                         // -----------------第三部分遍历图层进行数据处理 -------------------------------
+//                        1.方法:先获取当前图层数据,进行数据处理,获取到变化和变更多少条
+//                        2.写一个方法,通过交集求出变化和变更多少条
+//                         3. 	a.合并情况,假定excel中3条数据,先遍历excel 然后,每条数据key-然后求所有交集得到id 分组。
+//                        每一条数据获取到其 ewkt,然后进行,库中取查询,查询出所包含的数据的id
+
+                        List<Map<String, String>> dbFieldNameAndTypeList = cadastreFileMapper.selectTableCollumAndType(name.toLowerCase(Locale.ROOT));
+                        Map<String, String> dbFieldNameAndTypeMap = dbFieldNameAndTypeList.stream().collect(Collectors.toMap(
+                                s -> s.get("column_name"),
+                                s -> s.get("data_type"),
+                                (existing, replacement) -> existing // 如果有重复键,保留第一个值
+                        ));
+
+                        Map<String, String> columnTypeMap = new LinkedHashMap<>();
+                        for (Map<String, String> col : dbFieldNameAndTypeList) {
+                            columnTypeMap.put(col.get("column_name"), col.get("data_type"));
+                        }
 
-
-
+                        List<Map<String, Object>> theValueList = getValueList(layer, dbFieldNameAndTypeMap, haveGeom);
+                        //1-合并;2-拆分
+                        if("1".equalsIgnoreCase(landChangeMode)){
+                            //这里进行遍历每条数据,获取到其geom,然后进行库中查询,获取到所有的id,然后进行分组,获取到变化和变更多少条
+                            Map<Map<String, Object>, List<Integer>> geomToIdsMap = new HashMap<>();
+                            Map<Map<String, Object>, String> zddmMap = new HashMap<>();
+
+                            for (Map<String, Object> theValue : theValueList) {
+                                String wkt = (String) theValue.get("geom");
+                                List<Zdjbxx> containsZdList = zdjbxxMapper.selectByContainsWkt(wkt, landRightType);
+                                if(CollectionUtils.isEmpty(containsZdList)){
+                                    throw new ServiceException(theValue + "当前数据在库中不存在分割的数据,无法进行合并操作,请检查数据是否正确!");
+                                }
+                                containsZdList.stream().filter(s->s.getGeom()!=null).forEach(s->{
+                                    List<Integer> idList = geomToIdsMap.getOrDefault(theValue, new ArrayList<>());
+                                    idList.add(s.getBsm());
+                                    geomToIdsMap.put(theValue, idList);
+                                    //这里需要把宗地代码用/分隔,存储到zddmMap中
+                                    zddmMap.put(theValue, zddmMap.getOrDefault(theValue, "") + s.getZddm() + "/");
+                                });
+                            }//end for
+
+                            //这里针对每个key 进行入库,然后,修改bsm的zt 然后,进行入库。
+                            // -----------------第四部分遍历图层进行数据处理 ------------------------------------
+                            if(MapUtils.isNotEmpty(geomToIdsMap)){
+                                ObjectMapper objectMapper = new ObjectMapper();
+                                for(Map.Entry<Map<String, Object>, List<Integer>> entry : geomToIdsMap.entrySet()){
+                                    Map<String, Object> theValue = entry.getKey();
+                                    List<Integer> idList = entry.getValue();
+                                    //theValue.put("bsm",null);
+                                    //theValue.put("valid_flag", 0);
+
+                                    //统一转成小写
+                                    Map<String,Object> newMap = new HashMap<>();
+                                    for(Map.Entry<String,Object> e : theValue.entrySet()){
+                                        newMap.put(e.getKey().toLowerCase(), e.getValue());
+                                    }
+
+                                    //cleanDataForInsert(newMap, columnTypeMap);
+                                    Zdjbxx zdjbxx = objectMapper.convertValue(newMap, Zdjbxx.class);
+                                    zdjbxx.setValidFlag(0);
+                                    zdjbxx.setSm(landRightType);
+                                    zdjbxx.setJsydghxkzh("biangeng");//建设用地规划许可证号(测试用)
+                                    //1.入库
+                                    zdjbxxMapper.add(zdjbxx);
+                                    //2.修改bsm的zt
+                                    zdjbxxMapper.updateZtByBsmList(idList);
+                                    //合并处理入库之后需要记录到变更记录表:
+                                    String bhqzddm =   zddmMap.get(theValue);//变化前宗地代码,多个用/分隔
+                                    addZdbhqkData(zdjbxx,bhqzddm,"多块合并为一块"); //更新变化情况表
+                                }
+                            }
+                        } else if ("2".equalsIgnoreCase(landChangeMode)) { //这里拆分逻辑
+                            //这里进行遍历每条数据,获取到其geom,然后进行库中查询,获取到所有的id,然后进行分组,获取到变化和变更多少条
+                            Map<Integer, String> zddmMap = new HashMap<>();
+                            Map<Integer,List<Map<String, Object>>>  zdBsmMap = new LinkedHashMap<>();
+                            for (Map<String, Object> theValue : theValueList) {
+                                /**
+                                 * 1.先查出所有的交集bsm
+                                 * 2.用交集的bsm 二次循环,获取交集为key 的list 集合。
+                                 * 3.得出一个map<交集bsm,list<宗地信息>>  然后进行入库
+                                 * 4.  这里需要把宗地代码用/分隔,存储到zddmMap中
+                                 */
+                                String ewkt = (String) theValue.get("geom");
+                                List<Zdjbxx> containsZdList = zdjbxxMapper.selectByInvertContainsWkt(ewkt, landRightType);
+                                if(CollectionUtils.isEmpty(containsZdList)){
+                                    throw new ServiceException(theValue + "当前数据在库中不存在分割的数据,无法进行合并操作,请检查数据是否正确!");
+                                }
+                                if(containsZdList.size()>1){
+                                    throw new ServiceException(theValue + "当前拆分的地块,存在于多个历史地块中,请检查数据是否正确!");
+                                }
+                                Zdjbxx tmpZdjbxx = containsZdList.stream().findFirst().get();
+                                Integer dbZdBsm = tmpZdjbxx.getBsm();
+
+                                List<Map<String, Object>> bsmToFileList = zdBsmMap.computeIfAbsent(dbZdBsm, k -> new ArrayList<>());
+                                bsmToFileList.add(theValue);
+                                zddmMap.computeIfAbsent(dbZdBsm, k -> tmpZdjbxx.getZddm() );
+                                //zddmMap.put(dbZdBsm, zddmMap.getOrDefault(dbZdBsm, "") + tmpZdjbxx.getZddm());
+                                // 然后循环每一个map,再次转为
+                            }//end for
+
+                            //这里针对每个key 进行入库,然后,修改bsm的zt 然后,进行入库。
+                            // -----------------第四部分遍历图层进行数据处理 ------------------------------------
+                            if(MapUtils.isNotEmpty(zdBsmMap)) {
+                                //这里是否做校验如拆分地块至少有两个子地块,才能进行拆分操作(但是地块变更也可能存在,大的地块,变为小的地块,所以不做这个校验)
+                                ObjectMapper objectMapper = new ObjectMapper();
+                                List<Integer> idList =new ArrayList<>();
+                                for (Map.Entry<Integer,List<Map<String, Object>>> entry : zdBsmMap.entrySet()) {
+                                    List<Map<String, Object>> theValue = entry.getValue();
+                                    Integer dbBsm = entry.getKey();
+                                    for(Map<String, Object> map:theValue){
+                                        //统一转成小写
+                                        Map<String,Object> newMap = new HashMap<>();
+                                        for(Map.Entry<String,Object> e : map.entrySet()){
+                                            newMap.put(e.getKey().toLowerCase(), e.getValue());
+                                        }
+                                        //cleanDataForInsert(newMap, columnTypeMap);
+                                        Zdjbxx zdjbxx = objectMapper.convertValue(newMap, Zdjbxx.class);
+                                        zdjbxx.setValidFlag(0);
+                                        zdjbxx.setSm(landRightType);
+                                        zdjbxx.setJsydghxkzh("biangeng");//建设用地规划许可证号(测试用)
+                                        zdjbxxMapper.add(zdjbxx);
+                                        //合并处理入库之后需要记录到变更记录表:
+                                        String bhqzddm = zddmMap.get(dbBsm);
+                                        addZdbhqkData(zdjbxx,bhqzddm,"拆分子地块"); //更新变化情况表
+                                    }
+                                    idList.add(dbBsm);
+                                } //end for
+                                //2.修改bsm的zt
+                                zdjbxxMapper.updateZtByBsmList(idList);
+                            }
+                        }
+                        int aa =100;
                     }
                 }
             } catch (Exception e) {
@@ -182,6 +326,35 @@ public class CadastreManageServiceImpl implements CadastreManageService {
 
 
 
+    /**
+     *
+     * @param zdjbxx
+     * @param bhqzddm 变更前宗地代码
+     * @param msg 变更消息
+     * @return
+     */
+    private String addZdbhqkData(Zdjbxx zdjbxx ,String bhqzddm,String msg) {
+        //这里入库一条相关数据,多个宗地号用/分隔
+        Zdbhqk zdbhqk = new Zdbhqk();
+        zdbhqk.setBdcdyh(zdjbxx.getBdcdyh());
+        zdbhqk.setZddm(zdjbxx.getZddm());
+        zdbhqk.setBhyy(msg);
+        zdbhqk.setBhnr(msg);
+        Date tmpDate = DateUtils.getNowDate();
+        zdbhqk.setBhsj(tmpDate);
+        zdbhqk.setDjsj(tmpDate);
+        //String bhqzddm =   zddmMap.get(theValue);
+        zdbhqk.setBhqzddm(bhqzddm); //变化前宗地代码,多个用/分隔
+        zdbhqk.setYwh(""+tmpDate.getTime());
+        zdbhqk.setDbr(""); //备案人
+        zdbhqk.setSsywh(""+tmpDate.getTime()); //申请业务号
+        zdbhqk.setFj("附记 :无"); //附记录
+        zdbhqk.setValidFlag(0);
+        zdbhqkMapper.add(zdbhqk);
+        return "success";
+    }
+
+
     /**
      *
      * 解析文件内容,insert 到表中
@@ -368,6 +541,8 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         try {
             List<CompareGemoVo> gemos = new ArrayList<>();
             CadastreFile cadastreFile = cadastreFileMapper.get(uploadId);
+            String landRightType = cadastreFile.getLandRightType();
+
             String gdbPath = cadastreFile.getUnzipPath();
             DataSource ds = ogr.Open(gdbPath + "/" + cadastreFile.getName(), 0); // 0 = 只读
             if (ds == null) {
@@ -383,7 +558,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                 compareGemoVo.setLayerName(layerName);
                 List<String> layerGeom = getLayerGeom(layer);
                 compareGemoVo.setGeomData(layerGeom);
-                List<String> dbGeom = getDbGeom(layerName);
+                List<String> dbGeom = getDbGeom(layerName,landRightType);
                 compareGemoVo.setOldGeomData(dbGeom);
                 //加入当前图层对比对象
                 gemos.add(compareGemoVo);
@@ -545,7 +720,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                     Layer layer = ds.GetLayer(i);
                     //todo 测试代码
                     //这里做质量检查
-                    CheckInfoVo checkRes = checkLayerInfo(layer, allTableList, uploadFile.getId());
+                    CheckInfoVo checkRes = checkLayerInfo(layer, allTableList, uploadFile.getId(),landRightType);
                     if (checkRes.getCheckStatus().equals(false)) { //检查出错
                         checkInfoFailList.add(checkRes);
                         checkInfoResult.setResultStatus(false);
@@ -567,7 +742,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                             String talbleName = String.valueOf(tableMap.get("name"));
                             Map<String, Object> allMdbTableFieldMap = MdbUtil.MdbTableContent(gdbPath + "/" + theFileName, talbleName, "", "", 1, 1000);
                             //这里做质量检查
-                            CheckInfoVo checkRes = checkMdbInfo(talbleName, allTableList, allMdbTableFieldMap, uploadFile.getId());
+                            CheckInfoVo checkRes = checkMdbInfo(talbleName, allTableList, allMdbTableFieldMap, uploadFile.getId(),landRightType);
                             if (checkRes.getCheckStatus().equals(false)) { //检查出错
                                 checkInfoFailList.add(checkRes);
                                 checkInfoResult.setResultStatus(false);
@@ -600,7 +775,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
      * @param allTableList
      * @return
      */
-    private CheckInfoVo checkLayerInfo(Layer layer, List<String> allTableList, String uploadId) {
+    private CheckInfoVo checkLayerInfo(Layer layer, List<String> allTableList, String uploadId,String landRightType) {
         //总返回对象
         CheckInfoVo checkInfoVo = new CheckInfoVo();
         checkInfoVo.setCheckStatus(true);//初始化检查通过
@@ -609,6 +784,15 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         String name = layer.GetName();
         checkInfoVo.setUploadFileTableName(name);
 
+        //宗地图层需要定义使用权或所有权
+        if ("zdjbxx".equalsIgnoreCase(name)) {
+            if(Objects.isNull(landRightType) || Stream.of("1","2").noneMatch(landRightType::equals)){
+                checkInfoList.add(name + ":包含宗地信息图层,需要指定使用权或所有权!");
+                fzssFxrwrzHandleService.insertFxrwrz(uploadId, "地籍库管理", name + ":包含宗地信息图层,需要指定使用权或所有权!", "info");
+                checkInfoVo.setCheckStatus(false);
+            }
+        }
+
         //检查表名对应
         if (!allTableList.contains(name.toLowerCase(Locale.ROOT))) {
             checkInfoList.add(name + ":图层名称不在地籍库范围内!");
@@ -682,7 +866,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
      * @param allTableList
      * @return
      */
-    private CheckInfoVo checkMdbInfo(String mdbTableName, List<String> allTableList, Map<String, Object> mdbTableFieldMap, String uploadId) {
+    private CheckInfoVo checkMdbInfo(String mdbTableName, List<String> allTableList, Map<String, Object> mdbTableFieldMap, String uploadId,String landRightType) {
         //总返回对象
         CheckInfoVo checkInfoVo = new CheckInfoVo();
         checkInfoVo.setCheckStatus(true);//初始化检查通过
@@ -696,6 +880,16 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         //所有条数
         List<Map<String, String>> dataList = (List<Map<String, String>>) mdbTableFieldMap.get("rows");
 
+        //宗地图层需要定义使用权或所有权
+        if ("zdjbxx".equalsIgnoreCase(mdbTableName)) {
+            if(Objects.isNull(landRightType) || Stream.of("1","2").noneMatch(landRightType::equals)){
+                checkInfoList.add(mdbTableName + ":包含宗地信息图层,需要指定使用权或所有权!");
+                fzssFxrwrzHandleService.insertFxrwrz(uploadId, "地籍库管理", mdbTableName + ":包含宗地信息图层,需要指定使用权或所有权!", "info");
+                checkInfoVo.setCheckStatus(false);
+            }
+        }
+
+
         //检查表名对应
         if (!allTableList.contains(mdbTableName.toLowerCase(Locale.ROOT))) {
             checkInfoList.add(mdbTableName + ":图层名称不在地籍库范围内!");
@@ -1064,9 +1258,11 @@ public class CadastreManageServiceImpl implements CadastreManageService {
      * @param tableName
      * @return
      */
-    private List<String> getDbGeom(String tableName) {
+
+    private List<String> getDbGeom(String tableName,String landRightType) {
         List<String> list = new ArrayList<>();
-        String geomsStr = cadastreFileMapper.selectGeoms(tableName);
+        tableName = com.siwei.common.core.utils.StringUtils.toRootLowerCase(tableName);
+        String geomsStr = cadastreFileMapper.selectGeoms(tableName,landRightType);
         if (StringUtils.isNotBlank(geomsStr)) {
             list = Arrays.asList(geomsStr.split("\\|"));
         }
@@ -1102,19 +1298,20 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                 return newMap;
             }).collect(Collectors.toList());
 
-
             List<Map<String, String>> dbFieldNameAndTypeList = cadastreFileMapper.selectTableCollumAndType(tableName.toLowerCase(Locale.ROOT));
             Map<String, String> columnTypeMap = new LinkedHashMap<>();
             for (Map<String, String> col : dbFieldNameAndTypeList) {
                 columnTypeMap.put(col.get("column_name"), col.get("data_type"));
             }
-            cadastreFileMapper.deleteByValidFlag("1", tableName);
-            cadastreFileMapper.updateValidFlag("1", "0", tableName);
+            cadastreFileMapper.deleteByValidFlag("1",landRightType, tableName);
+            cadastreFileMapper.updateValidFlag("1", "0",landRightType, tableName);
             for (Map<String, Object> map : theValueList) {
                 map.put("valid_flag", 0);
                 cleanDataForInsert(map, columnTypeMap);
                 if(tableName.equalsIgnoreCase("zdjbxx")){//这里使用主键自增
-                    map.put("bsm", "DEFAULT");
+                    map.remove("bsm");
+                    //map.put("bsm", "DEFAULT");
+                    //宗地权利类型(1-使用权;2-所有权)
                     if(StringUtils.isNotBlank(landRightType)){
                         map.put("sm", landRightType.trim());
                     }
@@ -1270,8 +1467,8 @@ public class CadastreManageServiceImpl implements CadastreManageService {
             for (Map<String, String> col : dbFieldNameAndTypeList) {
                 columnTypeMap.put(col.get("column_name"), col.get("data_type"));
             }
-            cadastreFileMapper.deleteByValidFlag("1", tableName);
-            List<Map<String, Object>> dbDataList = cadastreFileMapper.selectTableData("0", tableName);
+            cadastreFileMapper.deleteByValidFlag("1",landRightType, tableName);
+            List<Map<String, Object>> dbDataList = cadastreFileMapper.selectTableData("0",landRightType, tableName);
             List<Map<String, Object>> dbExistsList = new ArrayList<>();
             for (Map<String, Object> map : theValueList) {
                 Map<String, Object> dbExistsMap = cadastreFileMapper.selectExistsSameData("0", map, tableName);
@@ -1290,12 +1487,13 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                 theValueList.addAll(dbDataList);
             }
 
-            cadastreFileMapper.updateValidFlag("1", "0", tableName);
+            cadastreFileMapper.updateValidFlag("1", "0",landRightType, tableName);
             for (Map<String, Object> map : theValueList) {
                 map.put("valid_flag", 0);
                 cleanDataForInsert(map, columnTypeMap);
                 if(tableName.equalsIgnoreCase("zdjbxx")){//这里使用主键自增
-                    map.put("bsm", "DEFAULT");
+                    map.remove("bsm");
+                    //map.put("bsm", "DEFAULT");
                     //宗地权利类型(1-使用权;2-所有权)
                     if(StringUtils.isNotBlank(landRightType)){
                         map.put("sm", landRightType.trim());
@@ -1367,10 +1565,10 @@ public class CadastreManageServiceImpl implements CadastreManageService {
     public String backToOldData(String uploadId) {
         try {
             CadastreFile cadastreFile = cadastreFileMapper.get(uploadId);
+            String landRightType = cadastreFile.getLandRightType();
             if (!"1".equals(cadastreFile.getStatus())) {
                 throw new ServiceException("可能未入库成功,无法回退");
             }
-
             List<String> fileTableNameList = new ArrayList<>();
             if ("1".equals(cadastreFile.getFileType())) {//矢量数据
                 fileTableNameList = getLayerNameList(uploadId);
@@ -1387,9 +1585,8 @@ public class CadastreManageServiceImpl implements CadastreManageService {
             }
 
             for (String layerName : fileTableNameList) {
-
-                cadastreFileMapper.deleteByValidFlag("0", layerName.toLowerCase(Locale.ROOT));
-                cadastreFileMapper.updateValidFlag("0", "1", layerName.toLowerCase(Locale.ROOT));
+                cadastreFileMapper.deleteByValidFlag("0",landRightType,layerName.toLowerCase(Locale.ROOT));
+                cadastreFileMapper.updateValidFlag("0", "1",landRightType, layerName.toLowerCase(Locale.ROOT));
                 log.info("正在回退表:{}。。。", layerName);
             }
         } catch (Exception e) {
@@ -1458,6 +1655,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         List<LayerAndDbData> resList = new ArrayList<>();
         try {
             CadastreFile cadastreFile = cadastreFileMapper.get(uploadId);
+            String landRightType = cadastreFile.getLandRightType();
             //这里判断是否校验通过
             if (!cadastreFile.getStatus().equalsIgnoreCase("3")) {
                 log.info("校验未通过,不能入库");
@@ -1484,7 +1682,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                         (existing, replacement) -> existing // 如果有重复键,保留第一个值
                 ));
                 List<Map<String, Object>> theValueList = getValueList(layer, dbFieldNameAndTypeMap, haveGeom);
-                List<Map<String, Object>> dbDataList = cadastreFileMapper.selectTableData("0", layerName);
+                List<Map<String, Object>> dbDataList = cadastreFileMapper.selectTableData("0",landRightType,layerName);
 
                 layerAndDbData.setAddTotalNum(theValueList.size());
                 layerAndDbData.setInsertNum(theValueList.size());
@@ -1513,6 +1711,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         List<LayerAndDbData> resList = new ArrayList<>();
         try {
             CadastreFile cadastreFile = cadastreFileMapper.get(uploadId);
+            String landRightType = cadastreFile.getLandRightType();
             //这里判断是否校验通过
             if (!cadastreFile.getStatus().equalsIgnoreCase("3")) {
                 log.info("校验未通过,不能入库");
@@ -1528,7 +1727,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
 
                 Map<String, Object> allMdbTableFieldMap = MdbUtil.MdbTableContent(gdbPath + "/" + cadastreFile.getName(), talbleName, "", "", 1, 1000);
                 List<Map<String, Object>> theValueList = (List<Map<String, Object>>) allMdbTableFieldMap.get("rows");
-                List<Map<String, Object>> dbDataList = cadastreFileMapper.selectTableData("0", talbleName);
+                List<Map<String, Object>> dbDataList = cadastreFileMapper.selectTableData("0",landRightType, talbleName);
 
                 layerAndDbData.setAddTotalNum(theValueList.size());
                 layerAndDbData.setInsertNum(theValueList.size());
@@ -1550,6 +1749,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         List<MdbAndDbData> resList = new ArrayList<>();
         try {
             CadastreFile cadastreFile = cadastreFileMapper.get(uploadId);
+            String landRightType = cadastreFile.getLandRightType();
             //这里判断是否校验通过
             if (!cadastreFile.getStatus().equalsIgnoreCase("3")) {
                 log.info("校验未通过,不能入库");
@@ -1571,7 +1771,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
 
                 Map<String, Object> allMdbTableFieldMap = MdbUtil.MdbTableContent(gdbPath + "/" + cadastreFile.getName(), talbleName, "", "", 1, 1000);
                 List<Map<String, Object>> theValueList = (List<Map<String, Object>>) allMdbTableFieldMap.get("rows");
-                List<Map<String, Object>> dbDataList = cadastreFileMapper.selectTableData("0", talbleName);
+                List<Map<String, Object>> dbDataList = cadastreFileMapper.selectTableData("0",landRightType, talbleName);
 
                 //这里进行遍历dbDataList,判断是否存在bsm字段,且bsm字段是否存在于theValueList中
                 Set<String> mdbBsmSet = theValueList.stream()
@@ -1757,7 +1957,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
             }
 
             // 2. 获取表数据 (获取 valid_flag 为 0 的当前版本数据)
-            List<Map<String, Object>> dataList = cadastreFileMapper.selectTableData("", tableName);
+            List<Map<String, Object>> dataList = cadastreFileMapper.selectTableData("","", tableName);
 
             // 3. 构造完整的文件路径
             String mdbPath = filePath;

+ 2 - 2
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/ParcelServiceImpl.java

@@ -366,7 +366,7 @@ public class ParcelServiceImpl implements IParcelService {
      * @return ZdqlReportVO
      */
     @Override
-    public ZdqlReportVO getZdqlReport() {
+    public ZdqlReportVO getZdqlReport(String landRightType) {
         // ---------------------------------------------------
         // 1. 定义报表关注的权利类型列(顺序即为展示顺序)
         // ---------------------------------------------------
@@ -383,7 +383,7 @@ public class ParcelServiceImpl implements IParcelService {
         // ---------------------------------------------------
         // 2. 查询原始聚合数据(地籍子区 × 权利类型 × 登记状态)
         // ---------------------------------------------------
-        List<Map<String, Object>> rawData = zdjbxxMapper.getZdqlReportData(qllxCodes);
+        List<Map<String, Object>> rawData = zdjbxxMapper.getZdqlReportData(qllxCodes,landRightType);
 
         // ---------------------------------------------------
         // 3. 按地籍子区聚合:Map<djzqdm, Map<qllx, double[2]>>

+ 1 - 1
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/ConvergeServiceImpl.java

@@ -269,7 +269,7 @@ public class ConvergeServiceImpl implements ConvergeService {
             List<ConvergeRes> convergeTableList = new ArrayList<>();
             Arrays.stream(ConvergeTableEnum.values()).forEach(e -> {
                 String tableName = e.getTableName();
-                List<Map<String,Object>> tableDataList = cadastreFileMapper.selectTableData("",tableName);
+                List<Map<String,Object>> tableDataList = cadastreFileMapper.selectTableData("","",tableName);
                 if(CollectionUtils.isNotEmpty(tableDataList)){
                     List<Map<String,String>> tableFieldList = cadastreFileMapper.selectTableCollumAndType(tableName);
                     int convergeType = 2;

+ 2 - 3
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/NodeAttachmentImpl.java

@@ -744,7 +744,6 @@ public class NodeAttachmentImpl implements NodeAttachmentService {
                             .map(String::valueOf)
                             .orElse("");
 
-
                     if(StringUtils.isBlank(url)){ //这里避免空值造成数据无法传输
                         continue;
                     }
@@ -761,9 +760,9 @@ public class NodeAttachmentImpl implements NodeAttachmentService {
                     String fileName = Optional.ofNullable(attachment.getOrDefault("file_name", attachment.get("FILE_NAME")))
                             .map(String::valueOf)
                             .orElse("");
-
+                    //兼容 "file_name": "出让合同/划拨裁定书1.pdf",
+                    fileName = StringUtils.replace(fileName,"/","_");
                     String subDownLoadFilePath = fileDownLoadPath + "/" + directoryName;
-
                     //todo 这里不需要try catch 如果下载不了,不进行入库,可以便于查找问题
                     try {
                         ServiceFileUtil.downloadFile(url,fileName, subDownLoadFilePath,Constant.BDC);

+ 5 - 2
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/ProjectImpl.java

@@ -1935,8 +1935,11 @@ public class ProjectImpl implements ProjectService {
         List<ProjectWorkflow> projectWorkflows = projectWorkflowMapper
                 .selectByProjectIdAndNodeTableName(nodeVo.getProjectId(), nodeVo.getTableName());
         if (projectWorkflows != null && !projectWorkflows.isEmpty()) {
-            String id = projectWorkflows.get(0).getId();
-            projectWorkflowMapper.deleteById(id);
+            //删除关联表数据
+            for(ProjectWorkflow workflow : projectWorkflows){
+                String id = workflow.getId();
+                projectWorkflowMapper.deleteById(id);
+            }
         }
         projectMapper.deleteNodeByTable(nodeVo.getNodeId(), nodeVo.getTableName());
     }

+ 5 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/third/TakeDataService.java

@@ -41,4 +41,9 @@ public interface TakeDataService {
     void syncRemoteData(ThirdRecordStatusParamVo body);
 
 
+    Map<String, Object> remoteLandFirstRegistration_tmp(String projectId,String ywh) ;
+
+
+    Map<String, Object> remoteHouseFirstRegistration_tmp(String projectId,String ywh);
+
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1086 - 923
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/third/impl/DealExcelServiceImpl.java


+ 186 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/third/impl/TakeDataServiceImpl.java

@@ -17,6 +17,7 @@ import com.siwei.apply.service.third.TakeDataService;
 import com.siwei.apply.utils.HttpClientUtil;
 import com.siwei.apply.utils.ServiceUtil;
 import com.siwei.common.core.exception.ServiceException;
+import com.siwei.common.core.utils.DateUtils;
 import com.siwei.common.core.utils.StringUtils;
 import com.siwei.common.core.utils.bean.BeanUtils;
 import com.siwei.spatial.api.RemoteSpatialFilesDbService;
@@ -315,6 +316,80 @@ public class TakeDataServiceImpl implements TakeDataService {
     }
 
 
+    /**
+     * 此方法临时用
+     *
+     * @param
+     * @return
+     */
+    @Override
+    public Map<String, Object> remoteLandFirstRegistration_tmp(String projectId,String ywh) {
+        Map<String, Object> retMap = new HashMap<>();
+        //todo 这里进行远程请求,获取相关数据,解析后入库
+        try {
+            Map<String,Object> paramMap = new LinkedHashMap<>();
+            paramMap.put("ywbh",ywh);
+            paramMap.put("yfbdcdyh",null);
+
+            String remoteResult = ServiceUtil.getRemoteDataByHttpClient("query.landRegist.datas",paramMap);
+            JSONObject root = JSON.parseObject(remoteResult);
+            //todo 这里需要确认用户返回的是数组还是对象
+            JSONObject checkInnerData = root.getJSONObject("data");
+            if(!checkInnerData.get("code").equals("200")){
+                log.warn("当前业务不存在,业务号:{},返回数据: {}", ywh,checkInnerData);
+                return retMap;
+            }
+
+            JSONObject innerData = (JSONObject) root.getJSONObject("data").getJSONArray("data").get(0);
+            LandFirstParamVo body = JSON.parseObject(innerData.toString(), LandFirstParamVo.class);
+            if(Objects.nonNull(body)){
+                //todo 这里需要确认是否返回ywh字段
+                if(StringUtils.isBlank(body.getYwbh())){
+                    body.setYwbh(ywh);
+                }
+                String needUpdateNodeId = "";
+                String sourceId = body.getYwbh();
+                Gyjsydscdj existsNode = gyjsydscdjService.getBySourceId(sourceId);//这里需要根据sourceId 检查
+                if(Objects.nonNull(existsNode)){
+                    needUpdateNodeId = existsNode.getId();
+                }
+                String addNodeId = addOrUpdateLandFirstRegistration(body,projectId,needUpdateNodeId);
+                retMap.put("projectId",projectId);
+                retMap.put("nodeId",addNodeId);
+            }
+        } catch (Exception e) {
+            log.error("调用不动产土地首登记数据保存错误,业务编号:{}: ", ywh);
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+
+        //第二部分获取附件数据
+        try {
+            if(MapUtils.isNotEmpty(retMap)){
+                String nodeId = retMap.get("nodeId").toString();
+                Map<String,Object> paramMap = new LinkedHashMap<>();
+                paramMap.put("ywbh",ywh);
+                String remoteResult = ServiceUtil.getRemoteDataByHttpClient("query.ywFiles.datas",paramMap);
+                JSONObject root = JSON.parseObject(remoteResult);
+                JSONObject innerData = root.getJSONObject("data").getJSONObject("data");
+                LandFirstParamVo body = JSON.parseObject(innerData.toString(), LandFirstParamVo.class);
+                //这里保存附件信息
+                if(Objects.nonNull(body) && Objects.nonNull(body.getAttachment()) && !body.getAttachment().isEmpty()){
+                    nodeAttachmentService.getThirdAttachment(projectId,nodeId,AloneWorkFlowEnum.NODE_3.getName(),body.getAttachment());
+                }
+            }
+        } catch (Exception e) {
+            log.error("调用不动产获取附件信息错误,业务号:{}: ", ywh);
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+        return retMap;
+    }
+
+
+
+
+
 
 
     public String  addOrUpdateLandFirstRegistration(LandFirstParamVo body,String projectId,String needUpdateNodeId) {
@@ -556,6 +631,117 @@ public class TakeDataServiceImpl implements TakeDataService {
         return retMap;
     }
 
+
+    @Override
+    public Map<String, Object> remoteHouseFirstRegistration_tmp(String projectId,String ywh) {
+        Map<String, Object> retMap = new HashMap<>();
+        try {
+            Map<String,Object> paramMap = new LinkedHashMap<>();
+            paramMap.put("ywbh",ywh);
+            String remoteResult = ServiceUtil.getRemoteDataByHttpClient("query.ywFiles.datas",paramMap);
+            JSONObject root = JSON.parseObject(remoteResult);
+            //todo 这里需要确认返回数据是否是array结构
+            JSONObject innerData = root.getJSONObject("data").getJSONObject("data");
+            HouseFirstParamVo body = JSON.parseObject(innerData.toString(), HouseFirstParamVo.class);
+            if(Objects.nonNull(body)) {
+                //String projectId = immobileCodeRes.getProjectId();
+                //todo 这里的业务号不一定等于房屋中的业务号ywh
+                String addNodeId = "";
+                Gyjsydjfwscdj existsNode = gyjsydjfwscdjService.getBySourceId(ywh);//这里需要根据sourceId 检查已经存在
+                if(Objects.nonNull(existsNode)){ //如果已经存在不做处理
+                    addNodeId = existsNode.getId();
+                }else  {
+                    body.setYwbh(ywh);
+                    addNodeId = addOrUpdateHouseFirstRegistration(body,projectId,"");
+                }
+                //这里保存附件信息
+                // todo 这里的附件下载,为了性能考虑,是否要放在最后面
+                if(Objects.nonNull(body.getAttachment()) && !body.getAttachment().isEmpty()){
+                    nodeAttachmentService.getThirdAttachment(projectId,addNodeId,AloneWorkFlowEnum.NODE_7.getName(),body.getAttachment());
+                }
+                retMap.put("projectId",projectId);
+                retMap.put("nodeId",addNodeId);
+            }
+        } catch (Exception e) {
+            log.error("调用不动产获取附件信息错误,业务号:{}: ", ywh);
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+
+        // 第二部分,同步房屋的明细数据入库:
+        try {
+            //todo 这里需要同步房屋明细数据
+            // 同步完成后再次修改更新当前节点数据。把统计信息更新到数据表中。
+            // 这里需要分页进行查询,并且把数据都同步完毕。
+            // 既然开启了同步,需要把当前业务号的数据进行删除。
+            // 数据同步完成后,再计算统计数据,然后修改主表数据。
+            if(MapUtils.isNotEmpty(retMap)){
+                //同步前先删除
+                fwmxMapper.deleteByYwh(ywh);
+                Integer totalNum = 0;
+                Integer currentNum = 0;
+                Integer pageNumber = 1;
+                int pageSize = 20;
+                do{
+                    Map<String,Object> paramMap = new LinkedHashMap<>();
+                    paramMap.put("ywbh",ywh);
+                    paramMap.put("yfbdcdyh",null);
+                    paramMap.put("pageNumber",pageNumber);
+                    paramMap.put("pageSize",pageSize);
+                    String remoteResult = ServiceUtil.getRemoteDataByHttpClient("query.houseRegist.datas",paramMap);
+                    JSONObject root = JSON.parseObject(remoteResult);
+                    //todo 这里需要确认返回数据是否是array结构
+                    JSONObject innerData = root.getJSONObject("data");
+                    if(Objects.nonNull(innerData.get("total")) && totalNum == 0){
+                        totalNum = (Integer) innerData.get("total");//获取总条数
+                    }
+                    JSONArray innerArr = innerData.getJSONArray("data");
+                    if(innerArr != null && !innerArr.isEmpty()) {
+                        for (int i = 0; i < innerArr.size(); i++) {
+                            JSONObject innerObj = innerArr.getJSONObject(i);
+                            FwmxVo body = JSON.parseObject(innerObj.toString(), FwmxVo.class);
+                            if (Objects.nonNull(body)) {
+                                Fwmx fwmx = new Fwmx();
+                                fwmx.generateId();
+                                BeanUtils.copyProperties(body, fwmx);
+                                fwmx.setKfdw(body.getQlr()); //权利人
+                                Date djDate = DateUtils.parseDate(body.getDjrq());
+                                fwmx.setGzdgzsj(djDate);//登记日期
+                                fwmxMapper.add(fwmx);
+                            }
+                        }
+                    }
+                    pageNumber++;
+                    //todo 这里是否需要考虑不满20条情况
+                    currentNum += pageSize;
+                }while (totalNum > currentNum);
+                //这里再次查询明细,并更新主表
+                Fwmx statisticsData = fwmxMapper.getStatisticsByYwh(ywh);
+                //这边直接更新当前数据
+                if(Objects.nonNull(statisticsData)){
+                    HouseFirstParamVo body = new HouseFirstParamVo();
+                    body.setGzdgzsj(statisticsData.getGzdgzsj());
+                    body.setKfdw(statisticsData.getKfdw());
+                    body.setBdcqk(statisticsData.getBdcqk());
+                    body.setJzmj(statisticsData.getJzmj());
+                    body.setJzmjDw(statisticsData.getTdmjdw());
+                    body.setTnmj(statisticsData.getTnmj());
+                    body.setTnmjDw(statisticsData.getTdmjdw());
+                    body.setFtmj(statisticsData.getFtmj());
+                    body.setFtmjDw(statisticsData.getTdmjdw());
+                    addOrUpdateHouseFirstRegistration(body,retMap.get("projectId").toString(),retMap.get("nodeId").toString());
+                }
+            }
+        }catch (Exception e) {
+            log.error("调用不动产获取明细信息错误,业务号:{}: ", ywh);
+            throw new RuntimeException(e);
+        }
+        return retMap;
+    }
+
+
+
+
     /**
      * 通过土地用途名称获取土地的编码
      * @param useName

+ 4 - 2
siwei-modules/siwei-apply/src/main/resources/mapper/GyjsydscdjMapper.xml

@@ -23,6 +23,7 @@
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
         <result property="sourceId" column="source_id"/>
+        <result property="bz" column="bz"/>
     </resultMap>
 
     <select id="isExit" resultType="Boolean">
@@ -33,10 +34,10 @@
 
     <insert id="add" parameterType="com.siwei.apply.domain.Gyjsydscdj">
         INSERT INTO t_gyjsydscdj (id, project_id, qlr, gyqk, zl, qllx, qlxz, tdyt, area, area_unit, bdcdyh, bdczh, djjg, dj_date,
-                                  has_onchain, creator_id, created_at, updated_at, source_id)
+                                  bz, has_onchain, creator_id, created_at, updated_at, source_id)
         VALUES (#{id}, #{projectId}, #{qlr}, #{gyqk}, #{zl}, #{qllx}, #{qlxz}, #{tdyt}, #{area}, #{areaUnit}, #{bdcdyh}, #{bdczh},
                 #{djjg}, #{djDate},
-                #{hasOnchain}, #{creatorId}, now(), now(), #{sourceId})
+                #{bz}, #{hasOnchain}, #{creatorId}, now(), now(), #{sourceId})
     </insert>
 
     <!-- 根据项目ID获取记录(返回全部,按创建时间升序) -->
@@ -80,6 +81,7 @@
             <if test="bdczh != null">bdczh = #{bdczh},</if>
             <if test="djjg != null">djjg = #{djjg},</if>
             <if test="djDate != null">dj_date = #{djDate},</if>
+            <if test="bz != null">bz = #{bz},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             <if test="sourceId != null">source_id = #{sourceId},</if>
             updated_at = now()

+ 4 - 2
siwei-modules/siwei-apply/src/main/resources/mapper/JsgcghxkMapper.xml

@@ -23,6 +23,7 @@
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
         <result property="sourceId" column="source_id"/>
+        <result property="bz" column="bz"/>
     </resultMap>
 
     <select id="isExit" resultType="Boolean">
@@ -33,9 +34,9 @@
 
     <!-- 新增 -->
     <insert id="add" parameterType="com.siwei.apply.domain.Jsgcghxk">
-        INSERT INTO t_jsgcghxk (id, project_id, ydwz, yddw, qs, djq, jsgm, zsbh, fzjg, fz_date, has_onchain,
+        INSERT INTO t_jsgcghxk (id, project_id, ydwz, yddw, qs, djq, jsgm, zsbh, fzjg, fz_date, bz, has_onchain,
                                 creator_id, created_at, updated_at,source_id)
-        VALUES (#{id}, #{projectId}, #{ydwz}, #{yddw}, #{qs}, #{djq}, #{jsgm}, #{zsbh}, #{fzjg}, #{fzDate},
+        VALUES (#{id}, #{projectId}, #{ydwz}, #{yddw}, #{qs}, #{djq}, #{jsgm}, #{zsbh}, #{fzjg}, #{fzDate}, #{bz},
                 false, #{creatorId}, now(), now(),#{sourceId})
     </insert>
 
@@ -67,6 +68,7 @@
             <if test="zsbh != null">zsbh = #{zsbh},</if>
             <if test="fzjg != null">fzjg = #{fzjg},</if>
             <if test="fzDate != null">fz_date = #{fzDate},</if>
+            <if test="bz != null">bz = #{bz},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             <if test="sourceId != null">source_id = #{sourceId},</if>
             updated_at = now()

+ 4 - 2
siwei-modules/siwei-apply/src/main/resources/mapper/JsydghxkMapper.xml

@@ -26,6 +26,7 @@
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
         <result property="sourceId" column="source_id"/>
+        <result property="bz" column="bz"/>
     </resultMap>
 
     <select id="isExit" resultType="Boolean">
@@ -37,9 +38,9 @@
     <!-- 添加记录 -->
     <insert id="add" parameterType="com.siwei.apply.domain.Jsydghxk">
         INSERT INTO t_jsydghxk (id, project_id, yddw, ydwz, yd_area, yd_unit, tdyt, tdhqfs, pzydjg, pzydwh,
-                                jsgm, zsbh, fzjg, fz_date, has_onchain, creator_id, created_at, updated_at, source_id)
+                                jsgm, zsbh, fzjg, fz_date, bz, has_onchain, creator_id, created_at, updated_at, source_id)
         VALUES (#{id}, #{projectId}, #{yddw}, #{ydwz}, #{ydArea}, #{ydUnit}, #{tdyt}, #{tdhqfs}, #{pzydjg}, #{pzydwh},
-                #{jsgm}, #{zsbh}, #{fzjg}, #{fzDate}, false, #{creatorId}, now(), now(), #{sourceId})
+                #{jsgm}, #{zsbh}, #{fzjg}, #{fzDate}, #{bz}, false, #{creatorId}, now(), now(), #{sourceId})
     </insert>
 
     <!-- 根据项目ID获取记录 -->
@@ -82,6 +83,7 @@
             <if test="zsbh != null">zsbh = #{zsbh},</if>
             <if test="fzjg != null">fzjg = #{fzjg},</if>
             <if test="fzDate != null">fz_date = #{fzDate},</if>
+            <if test="bz != null">bz = #{bz},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             <if test="sourceId != null">source_id = #{sourceId},</if>
             updated_at = now()

+ 17 - 0
siwei-modules/siwei-apply/src/main/resources/mapper/ProjectMapper.xml

@@ -43,6 +43,23 @@
         where t_project.id = #{id}
     </select>
 
+    <select id="getByConditionList"  resultMap="projectMap">
+        SELECT * FROM t_project
+        <where>
+            <if test="name != null and name != ''">
+                OR name = #{name}
+            </if>
+            <if test="code != null and code != ''">
+                OR code = #{code}
+            </if>
+            <if test="company != null and company != ''">
+                OR company = #{company}
+            </if>
+        </where>
+    </select>
+
+
+
     <select id="getList" parameterType="com.siwei.apply.domain.vo.ProjectFilterVo" resultMap="projectMap">
         SELECT *
         FROM t_project

+ 25 - 2
siwei-modules/siwei-apply/src/main/resources/mapper/TdgyMapper.xml

@@ -23,6 +23,7 @@
         <result property="updatedAt" column="updated_at"/>
         <result property="gdUnit" column="gd_unit"/>
         <result property="nf" column="nf"/>
+        <result property="bz" column="bz"/>
     </resultMap>
 
     <select id="isExit" resultType="Boolean">
@@ -35,11 +36,11 @@
     <insert id="add" parameterType="com.siwei.apply.domain.Tdgy">
         INSERT INTO t_tdgy (id, project_id, srf, tdyt, jswz,
                             gd_area, gd_type, has_zz, hbcrfapfwh, hbcrhtbh,
-                            hbcrht_date, gd_unit, has_onchain, creator_id,
+                            hbcrht_date, gd_unit, bz, has_onchain, creator_id,
                             created_at, updated_at)
         VALUES (#{id}, #{projectId}, #{srf}, #{tdyt}, #{jswz},
                 #{gdArea}, #{gdType}, #{hasZz}, #{hbcrfapfwh}, #{hbcrhtbh},
-                #{hbcrhtDate}, #{gdUnit}, false, #{creatorId},
+                #{hbcrhtDate}, #{gdUnit}, #{bz}, false, #{creatorId},
                 now(), now())
     </insert>
 
@@ -73,6 +74,7 @@
             <if test="hbcrhtDate != null">hbcrht_date = #{hbcrhtDate},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             <if test="gdUnit != null">gd_unit = #{gdUnit},</if>
+            <if test="bz != null">bz = #{bz},</if>
             updated_at = now()
         </set>
         WHERE id = #{id}
@@ -308,9 +310,30 @@
     </select>
 
 
+    <!-- ========================================这里数据治理的相关sql====================================================== -->
+    <select id="getTdgyGeomList" resultType="map">
+        SELECT project.id AS project_id,
+        t_table.id AS node_id,
+        details.id AS details_id
+        FROM t_geom_db_details details
+        LEFT JOIN t_node_land land ON details.upload_id = land.geom_db_id
+        LEFT JOIN t_tdgy t_table ON land.node_id = t_table.id
+        LEFT JOIN t_project project ON project.id = t_table.project_id
+        WHERE project."name"  LIKE 'pro3%'  or   project."name"  LIKE 'xxxx3%' ;
+    </select>
 
 
 
+<!--    <select id="getIntersectsGeomZdList" resultType="map">-->
+<!--        SELECT project.id AS project_id,-->
+<!--               t_table.id AS node_id,-->
+<!--               details.id AS details_id,-->
+<!--        FROM t_geom_db_details details-->
+<!--                 LEFT JOIN t_node_land land ON details.upload_id = land.geom_db_id-->
+<!--                 LEFT JOIN t_tdgy t_table ON land.node_id = t_table.id-->
+<!--                 LEFT JOIN t_project project ON project.id = t_table.project_id-->
+<!--        WHERE t_table.has_onchain = true-->
+<!--    </select>-->
 
 
 </mapper>

+ 4 - 2
siwei-modules/siwei-apply/src/main/resources/mapper/TdhyhsMapper.xml

@@ -20,6 +20,7 @@
         <result property="updatedAt" column="updated_at"/>
         <result property="hyyj" column="hyyj"/>
         <result property="sourceId" column="source_id"/>
+        <result property="bz" column="bz"/>
     </resultMap>
 
     <select id="isExit" resultType="Boolean">
@@ -32,11 +33,11 @@
     <insert id="add" parameterType="com.siwei.apply.domain.Tdhyhs">
         INSERT INTO t_tdhyhs (id, project_id, ydwz, hgzh, fzjg, fz_date,
                                jsdw, gljsgcghxkh,hyyj,
-                               has_onchain, creator_id,
+                               bz, has_onchain, creator_id,
                                created_at, updated_at, source_id)
         VALUES (#{id}, #{projectId}, #{ydwz}, #{hgzh}, #{fzjg}, #{fzDate},
                 #{jsdw}, #{gljsgcghxkh},#{hyyj},
-                false, #{creatorId},
+                #{bz}, false, #{creatorId},
                 now(), now(), #{sourceId})
     </insert>
 
@@ -67,6 +68,7 @@
             <if test="jsdw != null">jsdw = #{jsdw},</if>
             <if test="gljsgcghxkh != null">gljsgcghxkh = #{gljsgcghxkh},</if>
             <if test="hyyj != null">hyyj = #{hyyj},</if>
+            <if test="bz != null">bz = #{bz},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             <if test="sourceId != null">source_id = #{sourceId},</if>
             updated_at = now()

+ 4 - 2
siwei-modules/siwei-apply/src/main/resources/mapper/TjyydhxMapper.xml

@@ -21,6 +21,7 @@
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
         <result property="hasOnchain" column="has_onchain"/>
+        <result property="bz" column="bz"/>
     </resultMap>
 
     <select id="isExit" resultType="Boolean">
@@ -32,9 +33,9 @@
     <!-- 添加记录 -->
     <insert id="add" parameterType="com.siwei.apply.domain.Tjyydhx">
         INSERT INTO t_tjyydhx (id, project_id, dkbm, area, area_unit, ydxz, ydwz,
-        cjbh, cj_date, cjyj, creator_id, has_onchain, created_at, updated_at)
+        cjbh, cj_date, cjyj, bz, creator_id, has_onchain, created_at, updated_at)
         VALUES (#{id}, #{projectId}, #{dkbm}, #{area}, #{areaUnit}, #{ydxz}, #{ydwz},
-        #{cjbh}, #{cjDate}, #{cjyj}, #{creatorId},false, now(), now())
+        #{cjbh}, #{cjDate}, #{cjyj}, #{bz}, #{creatorId},false, now(), now())
     </insert>
 
     <!-- 根据项目ID获取记录 -->
@@ -65,6 +66,7 @@
             <if test="cjbh != null">cjbh = #{cjbh},</if>
             <if test="cjDate != null">cj_date = #{cjDate},</if>
             <if test="cjyj != null">cjyj = #{cjyj},</if>
+            <if test="bz != null">bz = #{bz},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             updated_at = now()
         </set>

+ 6 - 4
siwei-modules/siwei-apply/src/main/resources/mapper/YdbpDataMapper.xml

@@ -20,21 +20,22 @@
         <result property="updatedAt" column="updated_at"/>
         <result property="batchType" column="batch_type"/>
         <result property="projectPropertyId" column="project_property_id"/>
+        <result property="bz" column="bz"/>
     </resultMap>
     <insert id="add" parameterType="com.siwei.apply.domain.YdbpData">
         INSERT INTO t_ydbp_data (
-            id, name, yd_area, yd_unit, zs_area, zs_unit, has_zz, bp_date, pfwh, pf_date, creator_id, created_at, updated_at
+            id, name, yd_area, yd_unit, zs_area, zs_unit, has_zz, bp_date, pfwh, pf_date, bz, creator_id, created_at, updated_at
         ) VALUES (
-            #{id}, #{name}, #{ydArea}, #{ydUnit}, #{zsArea}, #{zsUnit}, #{hasZz}, #{bpDate}, #{pfwh}, #{pfDate}, #{creatorId}, now(), now()
+            #{id}, #{name}, #{ydArea}, #{ydUnit}, #{zsArea}, #{zsUnit}, #{hasZz}, #{bpDate}, #{pfwh}, #{pfDate}, #{bz}, #{creatorId}, now(), now()
         )
     </insert>
     <select id="getById" parameterType="string" resultMap="YdbpDataResultMap">
-        SELECT id, name, yd_area, yd_unit, zs_area, zs_unit, has_zz, bp_date, pfwh, pf_date, creator_id, created_at, updated_at,has_onchain
+        SELECT id, name, yd_area, yd_unit, zs_area, zs_unit, has_zz, bp_date, pfwh, pf_date, bz, creator_id, created_at, updated_at,has_onchain
         FROM t_ydbp_data
         WHERE id = #{id}
     </select>
     <select id="selectPage" resultMap="YdbpDataResultMap">
-        SELECT id, name, yd_area, yd_unit, zs_area, zs_unit, has_zz, bp_date, pfwh, pf_date, creator_id, created_at, updated_at
+        SELECT id, name, yd_area, yd_unit, zs_area, zs_unit, has_zz, bp_date, pfwh, pf_date, bz, creator_id, created_at, updated_at
         FROM t_ydbp_data
         where 1=1
         <if test="name != null and name != ''">
@@ -70,6 +71,7 @@
             <if test="bpDate != null">bp_date = #{bpDate},</if>
             <if test="pfwh != null">pfwh = #{pfwh},</if>
             <if test="pfDate != null">pf_date = #{pfDate},</if>
+            <if test="bz != null">bz = #{bz},</if>
             updated_at = #{updatedAt}
         </set>
         WHERE id = #{id}

+ 4 - 2
siwei-modules/siwei-apply/src/main/resources/mapper/YdbpMapper.xml

@@ -20,6 +20,7 @@
         <result property="creatorId" column="creator_id"/>
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
+        <result property="bz" column="bz"/>
     </resultMap>
     <select id="isExit" resultType="Boolean">
         SELECT COUNT(1) > 0
@@ -29,9 +30,9 @@
     <!-- 插入语句 -->
     <insert id="add" parameterType="com.siwei.apply.domain.Ydbp">
         INSERT INTO t_ydbp (id, project_id, tdyt, yd_area, yd_unit, zs_area, zs_unit, has_zz,
-                            bp_date, pfwh, pf_date, has_onchain, creator_id, created_at, updated_at)
+                            bp_date, pfwh, pf_date, bz, has_onchain, creator_id, created_at, updated_at)
         VALUES (#{id}, #{projectId}, #{tdyt}, #{ydArea}, #{ydUnit}, #{zsArea}, #{zsUnit}, #{hasZz},
-                #{bpDate}, #{pfwh}, #{pfDate}, false, #{creatorId}, now(), now())
+                #{bpDate}, #{pfwh}, #{pfDate}, #{bz}, false, #{creatorId}, now(), now())
     </insert>
 
     <!-- 查询语句 -->
@@ -198,6 +199,7 @@
             <if test="bpDate != null">bp_date = #{bpDate},</if>
             <if test="pfwh != null">pfwh = #{pfwh},</if>
             <if test="pfDate != null">pf_date = #{pfDate},</if>
+            <if test="bz != null">bz = #{bz},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             updated_at = now()
         </set>

+ 5 - 2
siwei-modules/siwei-apply/src/main/resources/mapper/YdysyxzMapper.xml

@@ -18,6 +18,8 @@
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
         <result property="creatorId" column="creator_id"/>
+        <result property="bz" column="bz"/>
+
     </resultMap>
     <!-- attachment 字段已被数据库删除,移除相关映射 -->
     <select id="isExit" resultType="Boolean">
@@ -28,9 +30,9 @@
 
     <insert id="add" parameterType="com.siwei.apply.domain.Ydysyxz">
         INSERT INTO t_ydysyxz (id, project_id, jsyj, jsdd, area, area_unit, has_zz,
-                               xmjsyj, zzwh, fz_date, has_onchain, created_at, updated_at, creator_id)
+                               xmjsyj, zzwh, fz_date, bz, has_onchain, created_at, updated_at, creator_id)
         VALUES (#{id}, #{projectId}, #{jsyj}, #{jsdd}, #{area}, #{areaUnit}, #{hasZz},
-                #{xmjsyj}, #{zzwh}, #{fzDate},
+                #{xmjsyj}, #{zzwh}, #{fzDate}, #{bz},
                 false, now(), now(), #{creatorId})
     </insert>
     <select id="get" resultMap="resMap">
@@ -58,6 +60,7 @@
             <if test="xmjsyj != null">xmjsyj = #{xmjsyj},</if>
             <if test="zzwh != null">zzwh = #{zzwh},</if>
             <if test="fzDate != null">fz_date = #{fzDate},</if>
+            <if test="bz != null">bz = #{bz},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             updated_at = now()
         </set>

+ 40 - 5
siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/CadastreFileMapper.xml

@@ -19,17 +19,18 @@
         <result column="file_storage_time" property="fileStorageTime"/>
         <result column="update_time" property="updateTime"/>
         <result column="file_size" property="fileSize"/>
+        <result column="land_right_type" property="landRightType"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, name, upload_user, upload_time, file_path, proxy_path, unzip_path, file_type, storage, status, read_status, read_message, file_storage_time, update_time, file_size
+        id, name, upload_user, upload_time, file_path, proxy_path, unzip_path, file_type, storage, status, read_status, read_message, file_storage_time, update_time, file_size,land_right_type
     </sql>
 
     <insert id="add" parameterType="com.siwei.apply.domain.CadastreFile">
         INSERT INTO t_cadastre_file (
-            id, name, upload_user, upload_time, file_path, proxy_path, unzip_path, file_type, storage, status, read_status, read_message, file_storage_time, update_time, file_size
+            id, name, upload_user, upload_time, file_path, proxy_path, unzip_path, file_type, storage, status, read_status, read_message, file_storage_time, update_time, file_size, land_right_type
         ) VALUES (
-            #{id}, #{name}, #{uploadUser}, #{uploadTime}, #{filePath}, #{proxyPath}, #{unzipPath}, #{fileType}, #{storage}, #{status}, #{readStatus}, #{readMessage}, #{fileStorageTime}, #{updateTime}, #{fileSize}
+            #{id}, #{name}, #{uploadUser}, #{uploadTime}, #{filePath}, #{proxyPath}, #{unzipPath}, #{fileType}, #{storage}, #{status}, #{readStatus}, #{readMessage}, #{fileStorageTime},#{updateTime}, #{fileSize},#{landRightType}
         )
     </insert>
 
@@ -56,6 +57,7 @@
             <if test="fileStorageTime != null">file_storage_time = #{fileStorageTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="fileSize != null">file_size = #{fileSize},</if>
+            <if test="landRightType != null">land_right_type = #{landRightType},</if>
         </set>
         WHERE id = #{id}
     </update>
@@ -206,8 +208,17 @@
     <select id="selectGeoms"  resultType="string">
         SELECT array_to_string(array_agg(ST_AsEWKT(gd.geom)), '|') as "geoms"
         from vector.${tableName} gd
+        <where>
+            <if test="tableName=='zdjbxx'">
+                AND  gd.valid_flag = 0 AND   gd.zt IN ('1', '2')
+                <if test="landRightType != null and landRightType != ''">
+                    and  gd.sm= #{landRightType}
+                </if>
+            </if>
+        </where>
     </select>
 
+
     <select id="countByValidFlag" resultType="int">
         SELECT COUNT(*)
         FROM vector.${tableName}
@@ -228,7 +239,7 @@
             <if test="name != null and name != ''">
                 AND name LIKE CONCAT('%', #{name}, '%')
             </if>
-            <if test="fileType != null and fileType != ''">
+            <if test="fileType != null and fileType != '' and fileType != 0">
                 AND file_type = #{fileType}
             </if>
             <if test="storageBeginTime != null and storageBeginTime != ''"><!-- 结束时间检索 -->
@@ -282,10 +293,18 @@
         <if test="oldValidFlag != null and oldValidFlag != ''">
             and valid_flag= #{oldValidFlag}::int2
         </if>
+        <!-- 兼容宗地相关的权力类型  -->
+        <if test="landRightType != null and landRightType != ''">
+            and sm= #{landRightType}
+        </if>
     </update>
 
     <delete id="deleteByValidFlag">
-        DELETE  FROM  vector.${tableName}   WHERE valid_flag = #{validFlag}::int2
+        DELETE  FROM  vector.${tableName}
+        WHERE valid_flag = #{validFlag}::int2
+        <if test="landRightType != null and landRightType != ''">
+            and sm= #{landRightType}
+        </if>
     </delete>
 
     <select id="selectTableData"   resultType="Map">
@@ -294,6 +313,9 @@
         <if test="validFlag != null and validFlag != ''">
             and valid_flag= #{validFlag}::int2
         </if>
+        <if test="landRightType != null and landRightType != ''">
+            and sm= #{landRightType}
+        </if>
     </select>
 
     <select id="selectTableDataByCondition"   resultType="Map">
@@ -448,5 +470,18 @@
     </select>
 
 
+    <!-- ========================================这里数据治理的相关sql:modify 20260914====================================================== -->
+    <!--<select id="getIntersectsGeomZdList" resultType="map">-->
+<!--    ELSE ST_Area(ST_Intersection(public.ST_GeomFromEWKT(#{ewkt}), zd.geom)) / ST_Area(zd.geom) > 0.9-->
+    <select id="getIntersectsGeomZdList" resultType="Map">
+        SELECT *
+        FROM  vector.zd_shp  zd
+        where  1=1
+          AND CASE
+                  WHEN NULLIF(ST_Area(zd.geom,true),0) IS NULL THEN false
+                  ELSE ST_Area(ST_Intersection((SELECT geom from t_geom_db_details WHERE id=#{detailsId}), zd.geom),true) / ST_Area(zd.geom,true) > 0.9
+            END
+    </select>
+
 
 </mapper>

+ 60 - 0
siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/ZdbhqkMapper.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.siwei.apply.mapper.cadastre.ZdbhqkMapper">
+    <resultMap id="BaseResultMap" type="com.siwei.apply.domain.cadastre.Zdbhqk">
+        <id column="bdcdyh" property="bdcdyh"/>
+        <result column="zddm" property="zddm"/>
+        <result column="bhyy" property="bhyy"/>
+        <result column="bhnr" property="bhnr"/>
+        <result column="bhsj" property="bhsj"/>
+        <result column="djsj" property="djsj"/>
+        <result column="bhqzddm" property="bhqzddm"/>
+        <result column="ywh" property="ywh"/>
+        <result column="dbr" property="dbr"/>
+        <result column="ssywh" property="ssywh"/>
+        <result column="fj" property="fj"/>
+        <result column="valid_flag" property="validFlag"/>
+    </resultMap>
+
+    <insert id="add" parameterType="com.siwei.apply.domain.cadastre.Zdbhqk">
+        INSERT INTO vector.zdbhqk (
+            bdcdyh, zddm, bhyy, bhnr, bhsj, djsj, bhqzddm, ywh, dbr, ssywh, fj, valid_flag
+        ) VALUES (
+            #{bdcdyh}, #{zddm}, #{bhyy}, #{bhnr}, #{bhsj}, #{djsj}, #{bhqzddm}, #{ywh}, #{dbr}, #{ssywh}, #{fj}, #{validFlag}
+        )
+    </insert>
+
+    <select id="get" resultMap="BaseResultMap">
+        SELECT *
+        FROM vector.zdbhqk
+        WHERE bdcdyh = #{bdcdyh}
+          AND valid_flag = 0
+    </select>
+
+    <select id="getList" resultMap="BaseResultMap">
+        SELECT *
+        FROM vector.zdbhqk
+        WHERE valid_flag = 0
+    </select>
+
+    <update id="update" parameterType="com.siwei.apply.domain.cadastre.Zdbhqk">
+        UPDATE vector.zdbhqk
+        <set>
+            <if test="zddm != null">zddm = #{zddm},</if>
+            <if test="bhyy != null">bhyy = #{bhyy},</if>
+            <if test="bhnr != null">bhnr = #{bhnr},</if>
+            <if test="bhsj != null">bhsj = #{bhsj},</if>
+            <if test="djsj != null">djsj = #{djsj},</if>
+            <if test="bhqzddm != null">bhqzddm = #{bhqzddm},</if>
+            <if test="ywh != null">ywh = #{ywh},</if>
+            <if test="dbr != null">dbr = #{dbr},</if>
+            <if test="ssywh != null">ssywh = #{ssywh},</if>
+            <if test="fj != null">fj = #{fj},</if>
+            <if test="validFlag != null">valid_flag = #{validFlag},</if>
+        </set>
+        WHERE bdcdyh = #{bdcdyh}
+    </update>
+
+</mapper>

+ 99 - 5
siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/ZdjbxxMapper.xml

@@ -70,17 +70,18 @@
         <result column="valid_flag" property="validFlag"/>
     </resultMap>
 
-    <insert id="add" parameterType="com.siwei.apply.domain.cadastre.Zdjbxx">
+
+    <insert id="add" parameterType="com.siwei.apply.domain.cadastre.Zdjbxx" useGeneratedKeys="true" keyProperty="bsm" keyColumn="bsm">
         INSERT INTO vector.zdjbxx (
-            bsm, ysdm, bdcdyh, ybzddm, zddm, xmbh, dzjgh, glh, zdtzm, dclxtzm,
+            ysdm, bdcdyh, ybzddm, zddm, xmbh, dzjgh, glh, zdtzm, dclxtzm,
             zl, zdmj, mjdw, yt, ghytmc, ydyhfl, dj, jg, jgdw, qllx, qlxz, qlsdfs,
             rjl, jzmd, jzxg, zdszd, zdszn, zdszx, zdszb, tfh, djh, dah, dkdm, bz,
             zt, djzt, qlrsjsyrlxm, gmjjhyfldm, xmmc, zdmjzyy, tdsjyt, tdsjytmc,
             blc, zjzjdmj, zjzmj, jgrq, qsdcjs, gygyqk, sm, dcy, dcrq, bdcchjs,
-            cly, clrq, shyj, shr, shrq, dcdwjg, tdzspfwh, tdgywjh, jsydghxkzh,
+            cly, clrq, shyj, shr, shrq, dcdwjg, tdzspfwh, tdgywjh, jsydghxkzh,bdcdyb,
             geom, valid_flag
         ) VALUES (
-            #{bsm}, #{ysdm}, #{bdcdyh}, #{ybzddm}, #{zddm}, #{xmbh}, #{dzjgh}, #{glh},
+            #{ysdm}, #{bdcdyh}, #{ybzddm}, #{zddm}, #{xmbh}, #{dzjgh}, #{glh},
             #{zdtzm}, #{dclxtzm}, #{zl}, #{zdmj}, #{mjdw}, #{yt}, #{ghytmc}, #{ydyhfl},
             #{dj}, #{jg}, #{jgdw}, #{qllx}, #{qlxz}, #{qlsdfs}, #{rjl}, #{jzmd},
             #{jzxg}, #{zdszd}, #{zdszn}, #{zdszx}, #{zdszb}, #{tfh}, #{djh}, #{dah},
@@ -88,7 +89,7 @@
             #{zdmjzyy}, #{tdsjyt}, #{tdsjytmc}, #{blc}, #{zjzjdmj}, #{zjzmj},
             #{jgrq}, #{qsdcjs}, #{gygyqk}, #{sm}, #{dcy}, #{dcrq}, #{bdcchjs},
             #{cly}, #{clrq}, #{shyj}, #{shr}, #{shrq}, #{dcdwjg}, #{tdzspfwh},
-            #{tdgywjh}, #{jsydghxkzh}, #{geom}, #{validFlag}
+            #{tdgywjh}, #{jsydghxkzh},#{bdcdyb}, public.st_transform(public.st_geomfromewkt(#{geom}), 4326), #{validFlag}
         )
     </insert>
 
@@ -207,6 +208,20 @@
         WHERE bsm = #{bsm}
     </update>
 
+
+    <update id="updateZtByBsmList" parameterType="List">
+        UPDATE vector.zdjbxx
+        <set>
+            zt = '0'
+        </set>
+        WHERE bsm IN
+        <foreach collection="idList" item="bsm" open="(" separator="," close=")">
+            #{bsm}
+        </foreach>
+        and valid_flag = 0 and zt in ('1','2')
+    </update>
+
+
     <delete id="batchDelete">
         DELETE FROM vector.zdjbxx
         WHERE bsm IN
@@ -310,6 +325,9 @@
                 #{code}
             </foreach>
         </if>
+        <if test="landRightType != null and landRightType !=''">
+            AND zd.sm = #{landRightType}
+        </if>
         GROUP BY dq.djzqdm, dq.djzqmc, zd.qllx, zd.djzt
         ORDER BY dq.djzqdm, zd.qllx, zd.djzt
     </select>
@@ -345,4 +363,80 @@
         ORDER BY LEFT(zd.yt, 2), zd.qlxz
     </select>
 
+    <select id="selectByContainsWkt"  resultMap="BaseResultMap">
+        SELECT
+            bsm, ysdm, bdcdyh, ybzddm, zddm, xmbh, dzjgh, glh, zdtzm, dclxtzm,
+            zl, zdmj, mjdw, yt, ghytmc, ydyhfl, dj, jg, jgdw, qllx, qlxz, qlsdfs,
+            rjl, jzmd, jzxg, zdszd, zdszn, zdszx, zdszb, tfh, djh, dah, dkdm, bz,
+            zt, djzt, qlrsjsyrlxm, gmjjhyfldm, xmmc, zdmjzyy, tdsjyt, tdsjytmc,
+            blc, zjzjdmj, zjzmj, jgrq, qsdcjs, gygyqk, sm, dcy, dcrq, bdcchjs,
+            cly, clrq, shyj, shr, shrq, dcdwjg, tdzspfwh, tdgywjh, jsydghxkzh,
+            ST_AsEWKT(geom) as geom, valid_flag
+        FROM vector.zdjbxx
+        WHERE  st_contains(ST_Buffer(#{ewkt}::geography,0.1 )::geometry,geom)
+            <if test="rightType != null and rightType != ''">
+                and sm = #{rightType}
+            </if>
+          AND  valid_flag = 0 AND   zt IN ('1', '2')
+    </select>
+
+    <!-- 通过出传入的{wktList} string 类型的数据,然后展开为新表,进行一次交集查询  -->
+    <select id="queryByIntersectList" resultType="com.siwei.apply.domain.cadastre.Zdjbxx">
+        SELECT * FROM vector.zdjbxx gd
+        WHERE EXISTS (
+            SELECT 1 FROM unnest(#{wktList}::text[]) t(wkt)
+            WHERE public.ST_Intersects(gd.geom, public.ST_GeomFromEWKT(t.wkt))
+        )    AND valid_flag = 0 AND zt IN ('1', '2')
+    </select>
+
+    <select id="selectIntersectByGeom" resultType="com.siwei.apply.domain.cadastre.Zdjbxx">
+        SELECT * FROM vector.zdjbxx
+        WHERE public.ST_Intersects(geom, public.ST_GeomFromEWKT(#{ewkt}))
+          AND valid_flag = 0 AND zt IN ('1', '2')
+    </select>
+
+
+    <!-- 通过出传入的{wktList} Object 类型的数据,通过jsonb进行解析,然后展开成新表进行一次性命中查询  -->
+    <select id="queryMatchSubGeom2" resultType="java.util.Map">
+        SELECT
+        gd.bsm,
+        gd.bdcdyh,
+        gd.ybzddm,
+        gd.zddm,
+        -- 取出子图形内各个业务字段
+        sub ->> 'geom' AS sub_wkt,
+        sub ->> 'tbbh' AS tbbh,
+        sub ->> 'fileRowNo' AS fileRowNo,
+        sub ->> 'sourceArea' AS source_area,
+        -- 可继续取其他属性 sub ->> 'xxx'
+        public.ST_Area(public.ST_GeomFromEWKT(sub ->> 'geom')) AS db_calc_area
+        FROM vector.zdjbxx gd
+        -- 将Java List《!Map-->转为jsonb数组,然后展开
+        CROSS JOIN jsonb_array_elements(#{wktArray}::jsonb) AS t(sub)
+        WHERE
+        public.ST_Contains(
+        gd.geom,
+        public.ST_GeomFromEWKT(sub ->> 'geom')
+        )
+    </select>
+
+
+    <select id="selectByInvertContainsWkt"  resultMap="BaseResultMap">
+        SELECT
+        bsm, ysdm, bdcdyh, ybzddm, zddm, xmbh, dzjgh, glh, zdtzm, dclxtzm,
+        zl, zdmj, mjdw, yt, ghytmc, ydyhfl, dj, jg, jgdw, qllx, qlxz, qlsdfs,
+        rjl, jzmd, jzxg, zdszd, zdszn, zdszx, zdszb, tfh, djh, dah, dkdm, bz,
+        zt, djzt, qlrsjsyrlxm, gmjjhyfldm, xmmc, zdmjzyy, tdsjyt, tdsjytmc,
+        blc, zjzjdmj, zjzmj, jgrq, qsdcjs, gygyqk, sm, dcy, dcrq, bdcchjs,
+        cly, clrq, shyj, shr, shrq, dcdwjg, tdzspfwh, tdgywjh, jsydghxkzh,
+        ST_AsEWKT(geom) as geom, valid_flag
+        FROM vector.zdjbxx
+        WHERE st_contains(ST_Buffer(geom::geography, 0.1)::geometry,st_geomfromewkt(#{ewkt}))
+        <if test="rightType != null and rightType != ''">
+            and sm = #{rightType}
+        </if>
+        AND  valid_flag = 0 AND   zt IN ('1', '2')
+    </select>
+
+
 </mapper>

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio