新增电力相关内容

src/main/java/com/trs/project/CodeGenerator.java

@@ -52,11 +52,11 @@ public class CodeGenerator {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         //jdbc:mysql://www.nmsuny.com:53306/webharvy?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai
-        dsc.setUrl("jdbc:mysql://192.168.1.45:56033/ggzyexchange?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai");
+        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai");
         // dsc.setSchemaName("public");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        dsc.setUsername("trs");
-        dsc.setPassword("TRSadmin123!@#$");
+        dsc.setUsername("root");
+        dsc.setPassword("root");
         mpg.setDataSource(dsc);
 
         // 包配置

src/main/java/com/trs/project/CoreApplication.java

@@ -3,7 +3,9 @@ package com.trs.project;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.client.RestTemplate;
 
 
 @SpringBootApplication
@@ -14,4 +16,5 @@ public class CoreApplication {
         SpringApplication.run(CoreApplication.class, args);
     }
 
+
 }

src/main/java/com/trs/project/entity/NmNotice.java

@@ -1,482 +0,0 @@
-package com.trs.project.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data
-@TableName("nm_notice")
-public class NmNotice {
-
-  private String projectCode;
-  private String tenderProjectCode;
-  private String bidSectionCodes;
-  private String noticeBidNum;
-  private String noticeName;
-  private String noticeContent;
-  private long noticeSendTime;
-  private String noticeMedia;
-  private String url;
-  private String noticeNature;
-  private String bulletinType;
-  private long docGetStartTime;
-  private long docGetEndTime;
-  private String tenderDocGetMethod;
-  private long bidDocReferEndTime;
-  private long bidOpenTime;
-  private String bidDocReferMethod;
-  private String syndicatedFlag;
-  private String marginPayFlag;
-  private String marginPayType;
-  private String bulletinDuty;
-  private String bulletinDutyCodeType;
-  private String platformCode;
-  private String pubServicePlatCode;
-  private long dataTimestamp;
-  private String pspReleaseType;
-  private String pspRelateNoticeId;
-  private String pspFirstNoticeId;
-  private String tenderCode;
-  private String bidUrl;
-  private String bidOpenMethod;
-  private String tendererName;
-  private String tenderCodeType;
-  private String tendererCode;
-  private String tendererAddress;
-  private String tendererContactor;
-  private String tendererPhoneNumber;
-  private String tendererEmail;
-  private String tenderAgencyName;
-  private String tenderAgencyCodeType;
-  private String tenderAgencyCode;
-  private String tenderAgencyAddress;
-  private String tenderAgencyContactor;
-  private String tenderAgencyPhoneNumber;
-  private String tenderAgencyEmail;
-  private String examinerName;
-  private String otherContent;
-
-
-  public String getProjectCode() {
-    return projectCode;
-  }
-
-  public void setProjectCode(String projectCode) {
-    this.projectCode = projectCode;
-  }
-
-
-  public String getTenderProjectCode() {
-    return tenderProjectCode;
-  }
-
-  public void setTenderProjectCode(String tenderProjectCode) {
-    this.tenderProjectCode = tenderProjectCode;
-  }
-
-
-  public String getBidSectionCodes() {
-    return bidSectionCodes;
-  }
-
-  public void setBidSectionCodes(String bidSectionCodes) {
-    this.bidSectionCodes = bidSectionCodes;
-  }
-
-
-  public String getNoticeBidNum() {
-    return noticeBidNum;
-  }
-
-  public void setNoticeBidNum(String noticeBidNum) {
-    this.noticeBidNum = noticeBidNum;
-  }
-
-
-  public String getNoticeName() {
-    return noticeName;
-  }
-
-  public void setNoticeName(String noticeName) {
-    this.noticeName = noticeName;
-  }
-
-
-  public String getNoticeContent() {
-    return noticeContent;
-  }
-
-  public void setNoticeContent(String noticeContent) {
-    this.noticeContent = noticeContent;
-  }
-
-
-  public long getNoticeSendTime() {
-    return noticeSendTime;
-  }
-
-  public void setNoticeSendTime(long noticeSendTime) {
-    this.noticeSendTime = noticeSendTime;
-  }
-
-
-  public String getNoticeMedia() {
-    return noticeMedia;
-  }
-
-  public void setNoticeMedia(String noticeMedia) {
-    this.noticeMedia = noticeMedia;
-  }
-
-
-  public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-
-  public String getNoticeNature() {
-    return noticeNature;
-  }
-
-  public void setNoticeNature(String noticeNature) {
-    this.noticeNature = noticeNature;
-  }
-
-
-  public String getBulletinType() {
-    return bulletinType;
-  }
-
-  public void setBulletinType(String bulletinType) {
-    this.bulletinType = bulletinType;
-  }
-
-
-  public long getDocGetStartTime() {
-    return docGetStartTime;
-  }
-
-  public void setDocGetStartTime(long docGetStartTime) {
-    this.docGetStartTime = docGetStartTime;
-  }
-
-
-  public long getDocGetEndTime() {
-    return docGetEndTime;
-  }
-
-  public void setDocGetEndTime(long docGetEndTime) {
-    this.docGetEndTime = docGetEndTime;
-  }
-
-
-  public String getTenderDocGetMethod() {
-    return tenderDocGetMethod;
-  }
-
-  public void setTenderDocGetMethod(String tenderDocGetMethod) {
-    this.tenderDocGetMethod = tenderDocGetMethod;
-  }
-
-
-  public long getBidDocReferEndTime() {
-    return bidDocReferEndTime;
-  }
-
-  public void setBidDocReferEndTime(long bidDocReferEndTime) {
-    this.bidDocReferEndTime = bidDocReferEndTime;
-  }
-
-
-  public long getBidOpenTime() {
-    return bidOpenTime;
-  }
-
-  public void setBidOpenTime(long bidOpenTime) {
-    this.bidOpenTime = bidOpenTime;
-  }
-
-
-  public String getBidDocReferMethod() {
-    return bidDocReferMethod;
-  }
-
-  public void setBidDocReferMethod(String bidDocReferMethod) {
-    this.bidDocReferMethod = bidDocReferMethod;
-  }
-
-
-  public String getSyndicatedFlag() {
-    return syndicatedFlag;
-  }
-
-  public void setSyndicatedFlag(String syndicatedFlag) {
-    this.syndicatedFlag = syndicatedFlag;
-  }
-
-
-  public String getMarginPayFlag() {
-    return marginPayFlag;
-  }
-
-  public void setMarginPayFlag(String marginPayFlag) {
-    this.marginPayFlag = marginPayFlag;
-  }
-
-
-  public String getMarginPayType() {
-    return marginPayType;
-  }
-
-  public void setMarginPayType(String marginPayType) {
-    this.marginPayType = marginPayType;
-  }
-
-
-  public String getBulletinDuty() {
-    return bulletinDuty;
-  }
-
-  public void setBulletinDuty(String bulletinDuty) {
-    this.bulletinDuty = bulletinDuty;
-  }
-
-
-  public String getBulletinDutyCodeType() {
-    return bulletinDutyCodeType;
-  }
-
-  public void setBulletinDutyCodeType(String bulletinDutyCodeType) {
-    this.bulletinDutyCodeType = bulletinDutyCodeType;
-  }
-
-
-  public String getPlatformCode() {
-    return platformCode;
-  }
-
-  public void setPlatformCode(String platformCode) {
-    this.platformCode = platformCode;
-  }
-
-
-  public String getPubServicePlatCode() {
-    return pubServicePlatCode;
-  }
-
-  public void setPubServicePlatCode(String pubServicePlatCode) {
-    this.pubServicePlatCode = pubServicePlatCode;
-  }
-
-
-  public long getDataTimestamp() {
-    return dataTimestamp;
-  }
-
-  public void setDataTimestamp(long dataTimestamp) {
-    this.dataTimestamp = dataTimestamp;
-  }
-
-
-  public String getPspReleaseType() {
-    return pspReleaseType;
-  }
-
-  public void setPspReleaseType(String pspReleaseType) {
-    this.pspReleaseType = pspReleaseType;
-  }
-
-
-  public String getPspRelateNoticeId() {
-    return pspRelateNoticeId;
-  }
-
-  public void setPspRelateNoticeId(String pspRelateNoticeId) {
-    this.pspRelateNoticeId = pspRelateNoticeId;
-  }
-
-
-  public String getPspFirstNoticeId() {
-    return pspFirstNoticeId;
-  }
-
-  public void setPspFirstNoticeId(String pspFirstNoticeId) {
-    this.pspFirstNoticeId = pspFirstNoticeId;
-  }
-
-
-  public String getTenderCode() {
-    return tenderCode;
-  }
-
-  public void setTenderCode(String tenderCode) {
-    this.tenderCode = tenderCode;
-  }
-
-
-  public String getBidUrl() {
-    return bidUrl;
-  }
-
-  public void setBidUrl(String bidUrl) {
-    this.bidUrl = bidUrl;
-  }
-
-
-  public String getBidOpenMethod() {
-    return bidOpenMethod;
-  }
-
-  public void setBidOpenMethod(String bidOpenMethod) {
-    this.bidOpenMethod = bidOpenMethod;
-  }
-
-
-  public String getTendererName() {
-    return tendererName;
-  }
-
-  public void setTendererName(String tendererName) {
-    this.tendererName = tendererName;
-  }
-
-
-  public String getTenderCodeType() {
-    return tenderCodeType;
-  }
-
-  public void setTenderCodeType(String tenderCodeType) {
-    this.tenderCodeType = tenderCodeType;
-  }
-
-
-  public String getTendererCode() {
-    return tendererCode;
-  }
-
-  public void setTendererCode(String tendererCode) {
-    this.tendererCode = tendererCode;
-  }
-
-
-  public String getTendererAddress() {
-    return tendererAddress;
-  }
-
-  public void setTendererAddress(String tendererAddress) {
-    this.tendererAddress = tendererAddress;
-  }
-
-
-  public String getTendererContactor() {
-    return tendererContactor;
-  }
-
-  public void setTendererContactor(String tendererContactor) {
-    this.tendererContactor = tendererContactor;
-  }
-
-
-  public String getTendererPhoneNumber() {
-    return tendererPhoneNumber;
-  }
-
-  public void setTendererPhoneNumber(String tendererPhoneNumber) {
-    this.tendererPhoneNumber = tendererPhoneNumber;
-  }
-
-
-  public String getTendererEmail() {
-    return tendererEmail;
-  }
-
-  public void setTendererEmail(String tendererEmail) {
-    this.tendererEmail = tendererEmail;
-  }
-
-
-  public String getTenderAgencyName() {
-    return tenderAgencyName;
-  }
-
-  public void setTenderAgencyName(String tenderAgencyName) {
-    this.tenderAgencyName = tenderAgencyName;
-  }
-
-
-  public String getTenderAgencyCodeType() {
-    return tenderAgencyCodeType;
-  }
-
-  public void setTenderAgencyCodeType(String tenderAgencyCodeType) {
-    this.tenderAgencyCodeType = tenderAgencyCodeType;
-  }
-
-
-  public String getTenderAgencyCode() {
-    return tenderAgencyCode;
-  }
-
-  public void setTenderAgencyCode(String tenderAgencyCode) {
-    this.tenderAgencyCode = tenderAgencyCode;
-  }
-
-
-  public String getTenderAgencyAddress() {
-    return tenderAgencyAddress;
-  }
-
-  public void setTenderAgencyAddress(String tenderAgencyAddress) {
-    this.tenderAgencyAddress = tenderAgencyAddress;
-  }
-
-
-  public String getTenderAgencyContactor() {
-    return tenderAgencyContactor;
-  }
-
-  public void setTenderAgencyContactor(String tenderAgencyContactor) {
-    this.tenderAgencyContactor = tenderAgencyContactor;
-  }
-
-
-  public String getTenderAgencyPhoneNumber() {
-    return tenderAgencyPhoneNumber;
-  }
-
-  public void setTenderAgencyPhoneNumber(String tenderAgencyPhoneNumber) {
-    this.tenderAgencyPhoneNumber = tenderAgencyPhoneNumber;
-  }
-
-
-  public String getTenderAgencyEmail() {
-    return tenderAgencyEmail;
-  }
-
-  public void setTenderAgencyEmail(String tenderAgencyEmail) {
-    this.tenderAgencyEmail = tenderAgencyEmail;
-  }
-
-
-  public String getExaminerName() {
-    return examinerName;
-  }
-
-  public void setExaminerName(String examinerName) {
-    this.examinerName = examinerName;
-  }
-
-
-  public String getOtherContent() {
-    return otherContent;
-  }
-
-  public void setOtherContent(String otherContent) {
-    this.otherContent = otherContent;
-  }
-
-}

src/main/java/com/trs/project/entity/NmResultNotice.java

@@ -1,331 +0,0 @@
-package com.trs.project.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data
-@TableName("nm_result_notice")
-public class NmResultNotice {
-
-  private String projectCode;
-  private String tenderProjectCode;
-  private String bidSectionCode;
-  private String noticeName;
-  private String noticeContent;
-  private long noticeSendTime;
-  private String noticeMedia;
-  private String url;
-  private String bulletinType;
-  private String winBidderName;
-  private String bidderCodeType;
-  private String winBidderCode;
-  private String bidAmount;
-  private String platformCode;
-  private String pubServicePlatCode;
-  private long dataTimestamp;
-  private String pspRelateNoticeId;
-  private String pspFirstNoticeId;
-  private String pspRelateResultNoticeId;
-  private long pspBidOpenTime;
-  private String tenderCode;
-  private String otherContent;
-  private String bulletinDuty;
-  private String examinerName;
-  private String attachmentCode;
-  private String nBidderCodeType;
-  private String regionCode;
-  private String traPlaceCode;
-  private String tenderAgencyName;
-  private String tenderAgencyCode;
-  private String priceFormCode;
-  private String otherBidPrice;
-
-
-  public String getProjectCode() {
-    return projectCode;
-  }
-
-  public void setProjectCode(String projectCode) {
-    this.projectCode = projectCode;
-  }
-
-
-  public String getTenderProjectCode() {
-    return tenderProjectCode;
-  }
-
-  public void setTenderProjectCode(String tenderProjectCode) {
-    this.tenderProjectCode = tenderProjectCode;
-  }
-
-
-  public String getBidSectionCode() {
-    return bidSectionCode;
-  }
-
-  public void setBidSectionCode(String bidSectionCode) {
-    this.bidSectionCode = bidSectionCode;
-  }
-
-
-  public String getNoticeName() {
-    return noticeName;
-  }
-
-  public void setNoticeName(String noticeName) {
-    this.noticeName = noticeName;
-  }
-
-
-  public String getNoticeContent() {
-    return noticeContent;
-  }
-
-  public void setNoticeContent(String noticeContent) {
-    this.noticeContent = noticeContent;
-  }
-
-
-  public long getNoticeSendTime() {
-    return noticeSendTime;
-  }
-
-  public void setNoticeSendTime(long noticeSendTime) {
-    this.noticeSendTime = noticeSendTime;
-  }
-
-
-  public String getNoticeMedia() {
-    return noticeMedia;
-  }
-
-  public void setNoticeMedia(String noticeMedia) {
-    this.noticeMedia = noticeMedia;
-  }
-
-
-  public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-
-  public String getBulletinType() {
-    return bulletinType;
-  }
-
-  public void setBulletinType(String bulletinType) {
-    this.bulletinType = bulletinType;
-  }
-
-
-  public String getWinBidderName() {
-    return winBidderName;
-  }
-
-  public void setWinBidderName(String winBidderName) {
-    this.winBidderName = winBidderName;
-  }
-
-
-  public String getBidderCodeType() {
-    return bidderCodeType;
-  }
-
-  public void setBidderCodeType(String bidderCodeType) {
-    this.bidderCodeType = bidderCodeType;
-  }
-
-
-  public String getWinBidderCode() {
-    return winBidderCode;
-  }
-
-  public void setWinBidderCode(String winBidderCode) {
-    this.winBidderCode = winBidderCode;
-  }
-
-
-  public String getBidAmount() {
-    return bidAmount;
-  }
-
-  public void setBidAmount(String bidAmount) {
-    this.bidAmount = bidAmount;
-  }
-
-
-  public String getPlatformCode() {
-    return platformCode;
-  }
-
-  public void setPlatformCode(String platformCode) {
-    this.platformCode = platformCode;
-  }
-
-
-  public String getPubServicePlatCode() {
-    return pubServicePlatCode;
-  }
-
-  public void setPubServicePlatCode(String pubServicePlatCode) {
-    this.pubServicePlatCode = pubServicePlatCode;
-  }
-
-
-  public long getDataTimestamp() {
-    return dataTimestamp;
-  }
-
-  public void setDataTimestamp(long dataTimestamp) {
-    this.dataTimestamp = dataTimestamp;
-  }
-
-
-  public String getPspRelateNoticeId() {
-    return pspRelateNoticeId;
-  }
-
-  public void setPspRelateNoticeId(String pspRelateNoticeId) {
-    this.pspRelateNoticeId = pspRelateNoticeId;
-  }
-
-
-  public String getPspFirstNoticeId() {
-    return pspFirstNoticeId;
-  }
-
-  public void setPspFirstNoticeId(String pspFirstNoticeId) {
-    this.pspFirstNoticeId = pspFirstNoticeId;
-  }
-
-
-  public String getPspRelateResultNoticeId() {
-    return pspRelateResultNoticeId;
-  }
-
-  public void setPspRelateResultNoticeId(String pspRelateResultNoticeId) {
-    this.pspRelateResultNoticeId = pspRelateResultNoticeId;
-  }
-
-
-  public long getPspBidOpenTime() {
-    return pspBidOpenTime;
-  }
-
-  public void setPspBidOpenTime(long pspBidOpenTime) {
-    this.pspBidOpenTime = pspBidOpenTime;
-  }
-
-
-  public String getTenderCode() {
-    return tenderCode;
-  }
-
-  public void setTenderCode(String tenderCode) {
-    this.tenderCode = tenderCode;
-  }
-
-
-  public String getOtherContent() {
-    return otherContent;
-  }
-
-  public void setOtherContent(String otherContent) {
-    this.otherContent = otherContent;
-  }
-
-
-  public String getBulletinDuty() {
-    return bulletinDuty;
-  }
-
-  public void setBulletinDuty(String bulletinDuty) {
-    this.bulletinDuty = bulletinDuty;
-  }
-
-
-  public String getExaminerName() {
-    return examinerName;
-  }
-
-  public void setExaminerName(String examinerName) {
-    this.examinerName = examinerName;
-  }
-
-
-  public String getAttachmentCode() {
-    return attachmentCode;
-  }
-
-  public void setAttachmentCode(String attachmentCode) {
-    this.attachmentCode = attachmentCode;
-  }
-
-
-  public String getNBidderCodeType() {
-    return nBidderCodeType;
-  }
-
-  public void setNBidderCodeType(String nBidderCodeType) {
-    this.nBidderCodeType = nBidderCodeType;
-  }
-
-
-  public String getRegionCode() {
-    return regionCode;
-  }
-
-  public void setRegionCode(String regionCode) {
-    this.regionCode = regionCode;
-  }
-
-
-  public String getTraPlaceCode() {
-    return traPlaceCode;
-  }
-
-  public void setTraPlaceCode(String traPlaceCode) {
-    this.traPlaceCode = traPlaceCode;
-  }
-
-
-  public String getTenderAgencyName() {
-    return tenderAgencyName;
-  }
-
-  public void setTenderAgencyName(String tenderAgencyName) {
-    this.tenderAgencyName = tenderAgencyName;
-  }
-
-
-  public String getTenderAgencyCode() {
-    return tenderAgencyCode;
-  }
-
-  public void setTenderAgencyCode(String tenderAgencyCode) {
-    this.tenderAgencyCode = tenderAgencyCode;
-  }
-
-
-  public String getPriceFormCode() {
-    return priceFormCode;
-  }
-
-  public void setPriceFormCode(String priceFormCode) {
-    this.priceFormCode = priceFormCode;
-  }
-
-
-  public String getOtherBidPrice() {
-    return otherBidPrice;
-  }
-
-  public void setOtherBidPrice(String otherBidPrice) {
-    this.otherBidPrice = otherBidPrice;
-  }
-
-}

src/main/java/com/trs/project/exchange/SampleXxlJob.java

@@ -135,6 +135,15 @@ public class SampleXxlJob {
     @Autowired
     private CqSwProjectService cqSwProjectService;
 
+    @Autowired
+    private NmNoticeService nmNoticeService;
+
+    @Autowired
+    private NmProjectService nmProjectService;
+
+    @Autowired
+    private NmResultNoticeService nmResultNoticeService;
+
     /**
      * 1、工程-招标公告与资格预审公告【GC_NOTICEANDFILE】
      */
@@ -461,6 +470,30 @@ public class SampleXxlJob {
         detailMethod(0);//1:post  0:get
     }
 
+    /**
+     * 36、电力交易-招标公告与资格预审公告【NM_NOTICE】
+     */
+    @XxlJob("task_NmNotice")
+    public void NmNotice() throws Exception {
+        detailMethod(0);//1:post  0:get
+    }
+    /**
+     * 37、电力交易-项目【NM_PROJECT】
+     */
+    @XxlJob("task_NmProject")
+    public void NmProject() throws Exception {
+        detailMethod(0);//1:post  0:get
+    }
+    /**
+     * 38、电力交易-中标结果公示【NM_RESULT_NOTICE】
+     */
+    @XxlJob("task_NmResultNotice")
+    public void NmResultNotice() throws Exception {
+        detailMethod(0);//1:post  0:get
+    }
+
+
+
     private void detailMethod(Integer type){
         System.out.println("进来了==================");
         String param = XxlJobHelper.getJobParam();
@@ -846,7 +879,24 @@ public class SampleXxlJob {
                 XxlJobHelper.log(param+"：数据入库="+listCqSwProject.size());
                 cqSwProjectService.saveOrUpdateBatch(listCqSwProject);
                 break;
-
+            case "NM_NOTICE"://36、电力交易-招标公告与资格预审公告【NM_NOTICE】
+                List<NmNotice> nmNoticeList = JSONObject.parseArray(jsonArray.toJSONString(), NmNotice.class);
+                logger.info(param+"：数据入库="+nmNoticeList.size());
+                XxlJobHelper.log(param+"：数据入库="+nmNoticeList.size());
+                nmNoticeService.saveOrUpdateBatch(nmNoticeList);
+                break;
+            case "NM_PROJECT"://37、电力交易-项目【NM_PROJECT】
+                List<NmProject> nmProjectList = JSONObject.parseArray(jsonArray.toJSONString(), NmProject.class);
+                logger.info(param+"：数据入库="+nmProjectList.size());
+                XxlJobHelper.log(param+"：数据入库="+nmProjectList.size());
+                nmProjectService.saveOrUpdateBatch(nmProjectList);
+                break;
+            case "NM_RESULT_NOTICE"://38、电力交易-中标结果公示【NM_RESULT_NOTICE】
+                List<NmResultNotice> nmResultNotice = JSONObject.parseArray(jsonArray.toJSONString(), NmResultNotice.class);
+                logger.info(param+"：数据入库="+nmResultNotice.size());
+                XxlJobHelper.log(param+"：数据入库="+nmResultNotice.size());
+                nmResultNoticeService.saveOrUpdateBatch(nmResultNotice);
+                break;
             default:
         }
     }

src/main/test/java/com/trs/project/timer/BusinessTaskTest.java

@@ -49,7 +49,7 @@ public class BusinessTaskTest {
     private Long timeMillis = System.currentTimeMillis();
 
 
-    @Test
+   // @Test
     public void execute2() {
         try{
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -62,7 +62,7 @@ public class BusinessTaskTest {
 
             MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
             params.add("platform_code", "e64975be");
-            params.add("table_name", "ZRZY_JYZB_BIDWIN_NOTICE");
+            params.add("table_name", "NM_NOTICE");
             params.add("page", "1");
             params.add("page_size", "1");
             params.add("startTime", startDate.getTime());
@@ -80,7 +80,7 @@ public class BusinessTaskTest {
         return response;
     }
 
-    @Test
+   @Test
     public void execute() {
 //        TaskRecord byId = taskRecordService.getById("GC_NOTICEANDFILE");
 //        if(null == byId){
@@ -115,17 +115,16 @@ public class BusinessTaskTest {
 
         System.out.println(new Date().getTime());
         try{
-            JSONObject jsonObject = httpGetMethod("https://ggzyjy.nmg.gov.cn/adminNmg/api/down.do?platform_code=e64975be&table_name=ZRZY_JYZB_BIDWIN_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=NM_RESULT_NOTICE&page=1&page_size=20&startTime="+startDate.getTime()+"  ");
 
             String data = RSAUtils.decrypt(jsonObject.getString("data"));
             JSONArray jsonArray = JSONArray.parseArray(data);
             System.out.println(jsonArray);
-//                List list = JSONObject.parseArray(jsonArray.toJSONString(), GcNoticeandfile.class);
-//                for (int j=0;j<list.size();j++){
-//                    GcNoticeandfile GcNoticeandfile = (GcNoticeandfile)list.get(i);
-//                    GcNoticeandfile.g
-//                }
-//                gcNoticeandfileService.saveOrUpdateBatch(list);
+                List list = JSONObject.parseArray(jsonArray.toJSONString(), NmResultNotice.class);
+                for (int j=0;j<list.size();j++){
+                    NmResultNotice nmResultNoticeNmResultNotice = (NmResultNotice)list.get(j);
+                    System.out.println(nmResultNoticeNmResultNotice);
+                }
         }catch (Exception e){
             e.printStackTrace();
         }