devops 6 روز پیش
والد
کامیت
70bbc30276

+ 226 - 0
src/main/java/com/trs/project/entity/ZcBidpublicity.java

@@ -0,0 +1,226 @@
+package com.trs.project.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 中标(成交)结果公告
+ * </p>
+ *
+ * @author trs
+ * @since 2023-03-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZcBidpublicity extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 数据唯一标识(来源系统)
+     */
+    @TableId("SOURCE_DATA_KEY")
+    private String sourceDataKey;
+
+    /**
+     * 数据来源系统的编码
+     */
+    @TableField("SOURCE_DATA_CODE")
+    private String sourceDataCode;
+
+    /**
+     * 采购项目编号
+     */
+    @TableField("PURCHASE_PROJECT_CODE")
+    private String purchaseProjectCode;
+
+    /**
+     * 采购项目名称
+     */
+    @TableField("PURCHASE_PROJECT_NAME")
+    private String purchaseProjectName;
+
+    /**
+     * 采购项目子包编号
+     */
+    @TableField("PURCHASE_SECTION_CODE")
+    private String purchaseSectionCode;
+
+    /**
+     * 采购项目子包名称
+     */
+    @TableField("PURCHASE_SECTION_NAME")
+    private String purchaseSectionName;
+
+    /**
+     * 统一交易标识码
+     */
+    @TableField("UNIFIED_DEAL_CODE")
+    private String unifiedDealCode;
+
+    /**
+     * 公告标题
+     */
+    @TableField("WIN_BID_BULLETIN_TITLE")
+    private String winBidBulletinTitle;
+
+    /**
+     * 公告内容
+     */
+    @TableField("WIN_BID_BULLETIN_CONTENT")
+    private String winBidBulletinContent;
+
+    /**
+     * 公告开始时间
+     */
+    @TableField("WIN_BID_BULLETIN_START_TIME")
+    private Long winBidBulletinStartTime;
+
+    /**
+     * 公告结束时间
+     */
+    @TableField("WIN_BID_BULLETIN_END_TIME")
+    private Long winBidBulletinEndTime;
+
+    /**
+     * 公告源URL
+     */
+    @TableField("URL")
+    private String url;
+
+    /**
+     * 中标(成交)供应商名称
+     */
+    @TableField("WINNINGBIDDER_NAME")
+    private String winningbidderName;
+
+    /**
+     * 中标(成交)供应商类别
+     */
+    @TableField("WINNINGBIDDER_TYPE")
+    private String winningbidderType;
+
+    /**
+     * 中标(成交)供应商代码
+     */
+    @TableField("WINNINGBIDDER_CODE")
+    private String winningbidderCode;
+
+    /**
+     * 价款形式代码
+     */
+    @TableField("PRICE_FORM_CODE")
+    private String priceFormCode;
+
+    /**
+     * 中标(成交)价格
+     */
+    @TableField("WIN_BID_PRICE")
+    private BigDecimal winBidPrice;
+
+    /**
+     * 价格币种代码
+     */
+    @TableField("CURRENCY_CODE")
+    private String currencyCode;
+
+    /**
+     * 价格单位
+     */
+    @TableField("PRICE_UNIT")
+    private String priceUnit;
+
+    /**
+     * 中标优惠率或其它类型价格
+     */
+    @TableField("WIN_BID_RATE")
+    private String winBidRate;
+
+    /**
+     * 中标(成交)供应商地址
+     */
+    @TableField("WIN_BID_ADDRESS")
+    private String winBidAddress;
+
+    /**
+     * 标的名称
+     */
+    @TableField("SUBJECT_NAME")
+    private String subjectName;
+
+    /**
+     * 标的数量
+     */
+    @TableField("SUBJECT_COUNT")
+    private String subjectCount;
+
+    /**
+     * 标的参数
+     */
+    @TableField("SUBJECT_PARAMETERS")
+    private String subjectParameters;
+
+    /**
+     * 标的金额(元)
+     */
+    @TableField("SUBJECT_PRICE")
+    private BigDecimal subjectPrice;
+
+    /**
+     * 确认意见
+     */
+    @TableField("CONFIRMED_OPINIONS")
+    private String confirmedOpinions;
+
+    /**
+     * 确认文件
+     */
+    @TableField("CONFIRMED_DOCUMENTS")
+    private String confirmedDocuments;
+
+    /**
+     * 创建人
+     */
+    @TableField("CREATOR")
+    private String creator;
+
+    /**
+     * 交易系统标识码
+     */
+    @TableField("PLATFORM_CODE")
+    private String platformCode;
+
+    /**
+     * 交易服务系统标识码
+     */
+    @TableField("PUB_SERVICE_PLAT_CODE")
+    private String pubServicePlatCode;
+
+    /**
+     * 数据时间戳
+     */
+    @TableField("DATA_TIMESTAMP")
+    private Long dataTimestamp;
+
+    /**
+     * 交易中心编码
+     */
+    @TableField("DATA_SOURCE_CODE")
+    private String dataSourceCode;
+
+    @TableField(exist = false)
+    private String sumAll;
+
+
+    @TableField("REGION_CODE")
+    private String regionCode;
+
+    @TableField("TRA_PLACE_CODE")
+    private String traPlaceCode;
+
+}

+ 22 - 5
src/main/java/com/trs/project/exchange/SampleXxlJob.java

@@ -182,6 +182,10 @@ public class SampleXxlJob {
     private MarginReturnCeService marginReturnCeService;
 
 
+    @Autowired
+    private ZcBidpublicityService zcBidpublicityService;
+
+
     /**
      * 1、工程-招标公告与资格预审公告【GC_NOTICEANDFILE】
      */
@@ -691,6 +695,11 @@ public class SampleXxlJob {
         detailMethod(1);//1:post  0:get
     }
 
+    @XxlJob("task_ZC_BIDPUBLICITY")
+    public void ZC_BIDPUBLICITY() throws Exception {
+        detailMethod(1);//1:post  0:get
+    }
+
 
     private void detailMethod(Integer type){
         System.out.println("进来了==================");
@@ -1235,6 +1244,12 @@ public class SampleXxlJob {
                 XxlJobHelper.log(param+":数据入库="+nmResultNotice.size());
                 nmResultNoticeService.saveOrUpdateBatch(nmResultNotice);
                 break;
+            case "ZC_BIDPUBLICITY"://政府采购
+                List<ZcBidpublicity> zcBidpublicityList = JSONObject.parseArray(jsonArray.toJSONString(), ZcBidpublicity.class);
+                logger.info(param+":数据入库="+zcBidpublicityList.size());
+                XxlJobHelper.log(param+":数据入库="+zcBidpublicityList.size());
+                zcBidpublicityService.saveOrUpdateBatch(zcBidpublicityList);
+                break;
             case "JSGC_ProjectJHInfo"://39、工程招标计划【GC_JIHUAN_INFO】
                 List<GcJihuaInfo> gcJihuaInfos = JSONObject.parseArray(jsonArray.toJSONString(), GcJihuaInfo.class);
                 for (GcJihuaInfo gcJihuaInfo : gcJihuaInfos) {
@@ -1356,7 +1371,7 @@ public class SampleXxlJob {
                     String announcementCode = jsonArray.getJSONObject(j).getString("NOTICE_CODE");//公告编号
                     String announcementTitle = jsonArray.getJSONObject(j).getString("NOTICE_NAME");//公告标题
                     String announcementContent = jsonArray.getJSONObject(j).getString("ANNOUNCEMENT_CONNECT");//公告内容
-                    String regionCode = "";//地区代码
+                    String regionCode = jsonArray.getJSONObject(j).getString("REGION_CODE");//地区代码
                     Long issueTime = jsonArray.getJSONObject(j).getLong("NOTICE_SEND_TIME");//发布时间
                     String unifiedDealCode = jsonArray.getJSONObject(j).getString("UNIFIED_DEAL_CODE");//统一交易编码
                     String platformCode = jsonArray.getJSONObject(j).getString("PLATFORM_CODE");//平台编码
@@ -1375,7 +1390,7 @@ public class SampleXxlJob {
                     String announcementCode = jsonArray.getJSONObject(j).getString("NOTICE_CODE");//公告编号
                     String announcementTitle = jsonArray.getJSONObject(j).getString("NOTICE_NAME");//公告标题
                     String announcementContent = jsonArray.getJSONObject(j).getString("ANNOUNCEMENT_CONNECT");//公告内容
-                    String regionCode = "";//地区代码
+                    String regionCode = jsonArray.getJSONObject(j).getString("REGION_CODE");//地区代码
                     Long issueTime = jsonArray.getJSONObject(j).getLong("NOTICE_SEND_TIME");//发布时间
                     String unifiedDealCode = jsonArray.getJSONObject(j).getString("UNIFIED_DEAL_CODE");//统一交易编码
                     String platformCode = jsonArray.getJSONObject(j).getString("PLATFORM_CODE");//平台编码
@@ -1394,7 +1409,7 @@ public class SampleXxlJob {
                     String announcementCode = jsonArray.getJSONObject(j).getString("NOTICE_NO");//公告编号
                     String announcementTitle = jsonArray.getJSONObject(j).getString("NOTICE_NAME");//公告标题
                     String announcementContent = jsonArray.getJSONObject(j).getString("NOTICE_CONTENT");//公告内容
-                    String regionCode = "ZONE";//地区代码
+                    String regionCode = jsonArray.getJSONObject(j).getString("REGION_CODE");//地区代码
                     Long issueTime = jsonArray.getJSONObject(j).getLong("ISSUE_TIME");//发布时间
                     String unifiedDealCode = jsonArray.getJSONObject(j).getString("UNIFIED_DEAL_CODE");//统一交易编码
                     String platformCode = jsonArray.getJSONObject(j).getString("PLATFORM_CODE");//平台编码
@@ -1413,7 +1428,7 @@ public class SampleXxlJob {
                     String announcementCode = jsonArray.getJSONObject(j).getString("NOTICE_NO");//公告编号
                     String announcementTitle = jsonArray.getJSONObject(j).getString("NOTICE_NAME");//公告标题
                     String announcementContent = jsonArray.getJSONObject(j).getString("NOTICE_CONTENT");//公告内容
-                    String regionCode = "ZONE";//地区代码
+                    String regionCode = jsonArray.getJSONObject(j).getString("REGION_CODE");//地区代码
                     Long issueTime = jsonArray.getJSONObject(j).getLong("ISSUE_TIME");//发布时间
                     String unifiedDealCode = jsonArray.getJSONObject(j).getString("UNIFIED_DEAL_CODE");//统一交易编码
                     String platformCode = jsonArray.getJSONObject(j).getString("PLATFORM_CODE");//平台编码
@@ -1587,7 +1602,9 @@ public class SampleXxlJob {
         zrzySupple.setAnnouncementCode(announcementCode);
         zrzySupple.setAnnouncementTitle(announcementTitle);
         zrzySupple.setAnnouncementContent(announcementContent);
-        zrzySupple.setRegionCode(regionCode);
+        if(null != regionCode && !"".equals(regionCode)){
+            zrzySupple.setRegionCode(regionCode);
+        }
         zrzySupple.setIssueTime(issueTime);
         zrzySupple.setUnifiedDealCode(unifiedDealCode);
         zrzySupple.setPlatformCode(platformCode);

+ 18 - 0
src/main/java/com/trs/project/mapper/ZcBidpublicityMapper.java

@@ -0,0 +1,18 @@
+package com.trs.project.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.trs.project.entity.ZcBidpublicity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 中标(成交)结果公告 Mapper 接口
+ * </p>
+ *
+ * @author trs
+ * @since 2023-03-03
+ */
+@Mapper
+public interface ZcBidpublicityMapper extends BaseMapper<ZcBidpublicity> {
+
+}

+ 16 - 0
src/main/java/com/trs/project/service/ZcBidpublicityService.java

@@ -0,0 +1,16 @@
+package com.trs.project.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.trs.project.entity.ZcBidpublicity;
+
+/**
+ * <p>
+ * 中标(成交)结果公告 服务类
+ * </p>
+ *
+ * @author trs
+ * @since 2023-03-03
+ */
+public interface ZcBidpublicityService extends IService<ZcBidpublicity> {
+
+}

+ 21 - 0
src/main/java/com/trs/project/service/impl/ZcBidpublicityServiceImpl.java

@@ -0,0 +1,21 @@
+package com.trs.project.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.trs.project.entity.ZcBidpublicity;
+import com.trs.project.mapper.ZcBidpublicityMapper;
+import com.trs.project.service.ZcBidpublicityService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 中标(成交)结果公告 服务实现类
+ * </p>
+ *
+ * @author trs
+ * @since 2023-03-03
+ */
+@Service
+public class ZcBidpublicityServiceImpl extends ServiceImpl<ZcBidpublicityMapper, ZcBidpublicity> implements ZcBidpublicityService {
+
+}

+ 2 - 2
src/main/java/com/trs/project/test/Test.java

@@ -51,7 +51,7 @@ public class Test {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date startDate = null;
         try {
-            startDate = format.parse("2025-05-08 00:00:00");
+            startDate = format.parse("2026-01-01 00:00:00");
         } catch (ParseException e) {
             throw new RuntimeException(e);
         }
@@ -60,7 +60,7 @@ public class Test {
         try{///1724688000000
             ///1724688000000
             ///1724688000000
-            JSONObject jsonObject = httpGetMethod("https://ggzyjy.nmg.gov.cn/adminNmg/api/down.do?platform_code=e64975be&table_name=ZRZY_TD_CEDE_NOTICE&page=1&page_size=20&startTime="+startDate.getTime()+"  ");
+            JSONObject jsonObject = httpGetMethod("https://ggzyjy.nmg.gov.cn/adminNmg/api/down.do?platform_code=e64975be&table_name=ZC_BIDPUBLICITY&page=1&page_size=20&startTime="+startDate.getTime()+"  ");
 //            JSONObject jsonObject = httpGetMethod("https://ggzyjy.nmg.gov.cn/adminNmg/api/down.do?platform_code=e64975be&table_name=ZFCG_GONGAO&page=1&page_size=1&startTime="+startDate.getTime()+"  ");
             //JSONObject jsonObject = httpGetMethod("https://ggzyjy.nmg.gov.cn/adminNmg/api/down.do?platform_code=e64975be&table_name=GC_TENDERBIDFILEPUBLICITY&page=1&page_size=1&startTime=1724049516000");
 //            JSONObject jsonObject = httpGetMethod("https://ggzyjy.nmg.gov.cn/adminNmg/api/down.do?platform_code=e64975be&table_name=GC_TENDERBIDFILEPUBLICITY&page=1&page_size=10");

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 1 - 1
src/main/java/com/trs/project/util/RSAUtils.java


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است