调整

src/main/java/com/trs/ggzyexchange/enums/ClassIfy.java

@@ -22,6 +22,8 @@ public enum ClassIfy {
 
     FYFBZ_PROJECT("fyfbz_project", "非依法必招项目"),
 
+    ZRZY_TYZY("zrzy_tyzy", "通用资源"),
+
 
     /**
      * 编码对照 --- 上面公告类型

src/main/java/com/trs/ggzyexchange/schedul/AllianceCityWebsiteSchedul.java

@@ -244,6 +244,19 @@ public class AllianceCityWebsiteSchedul implements Job {
                         }
                         record.setTransactionTypeCode(ClassIfy.FYFBZ_PROJECT.getCode());
                         record.setTransactionTypeName(ClassIfy.FYFBZ_PROJECT.getName());
+                    }else if("200".equals(typeCode)){//非依法必招项目
+                        if("1".equals(typeName)){//招标公告
+                            record.setNoticeTypeCode(ClassIfy.TRANSFER_ANNOUNCEMENT.getCode());
+                            record.setNoticeTypeName(ClassIfy.TRANSFER_ANNOUNCEMENT.getName());
+                        }else if("2".equals(typeName)){//补充
+                            record.setNoticeTypeCode(ClassIfy.SUPPLE_ANNOUNCEMENT.getCode());
+                            record.setNoticeTypeName(ClassIfy.SUPPLE_ANNOUNCEMENT.getName());
+                        }else if("3".equals(typeName)){//结果
+                            record.setNoticeTypeCode(ClassIfy.TRANSACTION_PARCEL.getCode());
+                            record.setNoticeTypeName(ClassIfy.TRANSACTION_PARCEL.getName());
+                        }
+                        record.setTransactionTypeCode(ClassIfy.ZRZY_TYZY.getCode());
+                        record.setTransactionTypeName(ClassIfy.ZRZY_TYZY.getName());
                     }
                }else {
                    continue;

src/main/java/com/trs/ggzyexchange/schedul/GcBidExceptioNoticeSchedul.java

@@ -204,7 +204,7 @@ public class GcBidExceptioNoticeSchedul implements Job {
                                 try {
                                     //通过标包编号查询对应的附件信息
                                     QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
-//                                    gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","EXCEPTION_NOTICE_FILE");//add
+                                    gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","EXCEPTION_NOTICE_FILE");//add
                                     gcAttachmentQueryWrapper.like("BID_SECTION_CODE",bidSectionCode);
                                     List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
 

src/main/java/com/trs/ggzyexchange/schedul/GcTenderbidfileSchedul.java

@@ -192,7 +192,7 @@ public class GcTenderbidfileSchedul   implements Job {
                     List<GcAttachment> list3 = gcAttachmentService.list(gcAttachmentQueryWrapper3);
 
 
-                    //通过标包编号查询对应的附件信息
+/*                    //通过标包编号查询对应的附件信息
                     QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
 //                    gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","TENDER_FILE_FILE");//add
                     gcAttachmentQueryWrapper.eq("ASSOCIATION_CODE", record.getSourceDataKey());
@@ -206,18 +206,18 @@ public class GcTenderbidfileSchedul   implements Job {
                     gcAttachmentQueryWrapper2.eq("ASSOCIATION_CODE", record.getSourceDataKey());
                     gcAttachmentQueryWrapper2.notLike("ATTACHMENT_NAME","%xml");
                     gcAttachmentQueryWrapper2.notLike("ATTACHMENT_NAME","%nmgzf");
-                    List<GcAttachment> list2 = gcAttachmentService.list(gcAttachmentQueryWrapper2);
+                    List<GcAttachment> list2 = gcAttachmentService.list(gcAttachmentQueryWrapper2);*/
                     if(!ObjectUtils.isEmpty(list3)){
                         attachmentList.addAll(list3);
                     }
 
-                    if(!ObjectUtils.isEmpty(list2)){
+/*                    if(!ObjectUtils.isEmpty(list2)){
                         attachmentList.addAll(list2);
                     }
 
                     if(!ObjectUtils.isEmpty(list)){
                         attachmentList.addAll(list);
-                    }
+                    }*/
                 }else{
                     if(!ObjectUtils.isEmpty(split)){
                         if(split.length >=1){

src/main/resources/application.yml

@@ -13,8 +13,8 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.kingbase8.Driver
-#    url: jdbc:kingbase8://10.8.3.142:54321/ggzyexchange
-    url: jdbc:kingbase8://10.8.3.137:54321/ggzyexchange
+    url: jdbc:kingbase8://10.8.3.142:54321/ggzyexchange
+#    url: jdbc:kingbase8://10.8.3.137:54321/ggzyexchange
     username: ggzyexchange
     password: ggzyexchange
     druid:
@@ -30,6 +30,7 @@ spring:
       client:
         reactive:
           endpoints: 10.8.3.145:9200  # 要连接的ES客户端Rest Uri 多个逗号分隔  http://192.168.1.251:9200
+#          endpoints: 10.8.3.135:8407  # 要连接的ES客户端Rest Uri 多个逗号分隔  http://192.168.1.251:9200
           connection-timeout: 10s
           username: elastic
           password: TRSadmin123!@#
@@ -40,6 +41,7 @@ spring:
     rest:
       # 要连接的ES客户端Rest Uri 多个逗号分隔  http://192.168.1.251:9200
       uris: http://10.8.3.145:9200
+#      uris: http://10.8.3.135:8407
       connection-timeout: 10s
       read-timeout: 30s
       username: elastic

src/main/resources/mapper/GcBidExceptioNoticeMapper.xml

@@ -81,7 +81,8 @@
             gben.BULLETIN_TYPE bulletinTypeCode,
             gben.BULLETIN_DUTY bulletinDuty,
             gben.BID_SECTION_CODE bidSectionCodes,
-            gben.CREATE_DATE createDate
+            gben.CREATE_DATE createDate,
+            gben.DATA_TIMESTAMP dataTimestamp
         from
             GC_BID_EXCEPTIO_NOTICE gben
                 left join GC_TENDERPROJECT gct

src/main/resources/mapper/GcBidopenrecordMapper.xml

@@ -96,7 +96,8 @@
             gcb.PLATFORM_CODE platformCode,
             gcb.DATA_SOURCE_CODE dataSourceCode,
             gcb.BID_SECTION_CODES bidSectionCodes,
-            gcb.CREATE_DATE createDate
+            gcb.CREATE_DATE createDate,
+            gcb.DATA_TIMESTAMP dataTimestamp
         from
             GC_BIDOPENRECORD gcb
                 left join GC_TENDERPROJECT gct

src/main/resources/mapper/GcPerformanceMapper.xml

@@ -49,7 +49,8 @@
             gcpe.ACCEPTER bulletinDuty,
             gcpe.DATA_SOURCE_CODE dataSourceCode,
             gcpe.BID_SECTION_CODE bidSectionCodes,
-            gcpe.CREATE_DATE createDate
+            gcpe.CREATE_DATE createDate,
+            gcpe.DATA_TIMESTAMP dataTimestamp
             /*gcpe.CONTRACTSIGN_TIME docGetStartTime*/
             /*gcpe.FINISH_TIME docGetEndTime*/
         from