mycopy123@163.com 1 gadu atpakaļ
vecāks
revīzija
5af1f28d25

+ 14 - 0
src/main/java/com/trs/ggzyexchange/config/QuartzConfig.java

@@ -256,6 +256,20 @@ public class QuartzConfig {
                 .build();
     }
 
+    @Bean
+    public JobDetail jobZrzyTkqBidwinnoticeSchedul() {
+        return JobBuilder.newJob(ZrzyTkqBidwinnoticeSchedul.class).storeDurably().build();
+    }
+    //触发器
+    @Bean
+    public Trigger triggerZrzyTkqBidwinnoticeSchedul() {
+        return TriggerBuilder.newTrigger()
+                .withIdentity("triggerZrzyTkqBidwinnoticeSchedul", "groupTriggerZrzyTkqBidwinnoticeSchedul")
+                .withSchedule(CronScheduleBuilder.cronSchedule(this.strSron))
+                .forJob(jobZrzyTkqBidwinnoticeSchedul())
+                .build();
+    }
+
 
     /**
      * 创建Job实例

+ 2 - 1
src/main/java/com/trs/ggzyexchange/entity/ZrzyTkqBidwinnotice.java

@@ -229,6 +229,7 @@ public class ZrzyTkqBidwinnotice extends BaseEntity {
      */
     @TableField("DATA_SOURCE_CODE")
     private String dataSourceCode;
-
+    @TableField("CREATE_DATE")
+    private Long createDate;
 
 }

+ 3 - 1
src/main/java/com/trs/ggzyexchange/mapper/ZrzyTkqBidwinnoticeMapper.java

@@ -2,6 +2,7 @@ package com.trs.ggzyexchange.mapper;
 
 import com.trs.ggzyexchange.entity.ZrzyTkqBidwinnotice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author trs
  * @since 2024-01-04
  */
+@Mapper
 public interface ZrzyTkqBidwinnoticeMapper extends BaseMapper<ZrzyTkqBidwinnotice> {
-
+    Long maxDataTimeStamp();
 }

+ 101 - 10
src/main/java/com/trs/ggzyexchange/schedul/ZrzyTkqBidwinnoticeSchedul.java

@@ -32,15 +32,15 @@ import java.util.List;
  * @since 2023-02-24
  */
 
-@Component
-public class ZrzyTkqBidwinnoticeSchedul{
+//@Component
+//public class ZrzyTkqBidwinnoticeSchedul{
 
 /*}
-@Component
-public class ZrzyTkqBidwinnoticeSchedul implements Job {
+
     */
-/*
 
+@Component
+public class ZrzyTkqBidwinnoticeSchedul implements Job {
     private Logger logger = LoggerFactory.getLogger(ZrzyTkqBidwinnoticeSchedul.class);
 
     @Autowired
@@ -110,7 +110,97 @@ public class ZrzyTkqBidwinnoticeSchedul implements Job {
             }
         }
     }
+
     public List<TenderDetailsVo> getTenderDetailsVoListAll(Integer pageNo,Integer pageSize,Long time){
+        QueryWrapper<ZrzyTkqBidwinnotice> gcPerformanceQueryWrapper = new QueryWrapper<ZrzyTkqBidwinnotice>();
+        gcPerformanceQueryWrapper.gt("PUBLISHING_TIME",time);
+        Page<ZrzyTkqBidwinnotice> page = new Page<ZrzyTkqBidwinnotice>(pageNo, pageSize);
+        Page<ZrzyTkqBidwinnotice> page1 = zrzyTkqBidwinnoticeService.page(page,gcPerformanceQueryWrapper);
+        List<ZrzyTkqBidwinnotice> records = page1.getRecords();
+        List<TenderDetailsVo> tenderDetailsVos = new ArrayList<TenderDetailsVo>();
+        for (ZrzyTkqBidwinnotice record : records) {
+            TenderDetailsVo tenderDetailsVo = new TenderDetailsVo();
+
+            String sourceDataCode = record.getSourceDataCode();
+            if(!ObjectUtils.isEmpty(sourceDataCode)){
+                tenderDetailsVo.setProjectCode(sourceDataCode);
+            }
+            String noticeName = record.getNaAppName();
+            if(!ObjectUtils.isEmpty(noticeName)){
+                tenderDetailsVo.setNoticeName(noticeName);
+            }
+            String projectName = record.getNaAppName();
+            if(!ObjectUtils.isEmpty(projectName)){
+                tenderDetailsVo.setProjectName(projectName);
+            }
+            String traAgencyCode = record.getTraAgencyCode();
+            if(!ObjectUtils.isEmpty(traAgencyCode)){
+                tenderDetailsVo.setTenderProjectCode(traAgencyCode);
+            }
+            String announcementConnect = record.getAnnouncementConnect();
+            if(!ObjectUtils.isEmpty(announcementConnect)){
+                tenderDetailsVo.setNoticeContent(announcementConnect);
+            }
+
+            Long noticeSendTime = record.getPublishingTime();
+            Long createDate = record.getCreateDate();
+            if(!ObjectUtils.isEmpty(createDate)){
+                tenderDetailsVo.setNoticeSendTime(record.getCreateDate().toString());
+            }else{
+
+                if(!ObjectUtils.isEmpty(noticeSendTime)){
+                    tenderDetailsVo.setNoticeSendTime(noticeSendTime.toString());
+                    tenderDetailsVo.setDocGetStartTime(noticeSendTime.toString());
+                }
+            }
+
+
+            String regionCode = record.getRegionCode();
+            if(!ObjectUtils.isEmpty(regionCode)){
+                tenderDetailsVo.setRegionCode(regionCode);
+            }
+            Long noticeEndTime = record.getPublishingTime();
+            if(!ObjectUtils.isEmpty(noticeEndTime)){
+                tenderDetailsVo.setDocGetEndTime(noticeEndTime.toString());
+            }
+            String dataSourceCode = record.getDataSourceCode();
+            if(!ObjectUtils.isEmpty(dataSourceCode)){
+                tenderDetailsVo.setDataSourceCode(dataSourceCode);
+            }
+            String sourceDataKey = record.getSourceDataKey();
+            if(!ObjectUtils.isEmpty(sourceDataKey)){
+                tenderDetailsVo.setSourceDataKey(sourceDataKey+noticeSendTime);
+            }
+            tenderDetailsVos.add(tenderDetailsVo);
+        }
+        for (TenderDetailsVo record : tenderDetailsVos) {
+            try {
+                record.setNoticeTypeCode(ClassIfy.TRANSACTION_PARCEL.getCode());
+                record.setNoticeTypeName(ClassIfy.TRANSACTION_PARCEL.getName());
+                record.setTransactionTypeCode(ClassIfy.NATURAL_RESOURCES.getCode());
+                record.setTransactionTypeName(ClassIfy.NATURAL_RESOURCES.getName());
+                record = tenderDetailsVoService.getTenderDetailsVoAllOrther(record);
+                try {
+                    String regionCode = record.getRegionCode();
+                    AreaPlatform areaPlatformByRegionCode = areaPlatformService.getAreaPlatformByRegionCode(regionCode);
+                    if(!ObjectUtils.isEmpty(areaPlatformByRegionCode)){
+                        record.setPlatformCode(areaPlatformByRegionCode.getPlatformCode());
+                        record.setPlatformName(areaPlatformByRegionCode.getRegionName());
+                    }
+                    record.setIndustriesTypeName(ClassIfy.zrzy_ky.getName());
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+                TenderDetailsVoUtils.isNull(record);
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+        }
+        return tenderDetailsVos;
+    }
+
+
+/*    public List<TenderDetailsVo> getTenderDetailsVoListAll(Integer pageNo,Integer pageSize,Long time){
         QueryWrapper<ZrzyTkqBidwinnotice> gcPerformanceQueryWrapper = new QueryWrapper<ZrzyTkqBidwinnotice>();
         gcPerformanceQueryWrapper.gt("DATA_TIMESTAMP",time);
         Page<ZrzyTkqBidwinnotice> page = new Page<ZrzyTkqBidwinnotice>(pageNo, pageSize);
@@ -123,7 +213,7 @@ public class ZrzyTkqBidwinnoticeSchedul implements Job {
             if(!ObjectUtils.isEmpty(sourceDataKey)){
                 tenderDetailsVo.setSourceDataKey(sourceDataKey);
             }
-            String dealLandCode = record.getDealLandCode();
+            *//*String dealLandCode = record.getDealLandCode();
             if(!ObjectUtils.isEmpty(dealLandCode)){
                 tenderDetailsVo.setProjectCode(dealLandCode);
             }
@@ -138,7 +228,9 @@ public class ZrzyTkqBidwinnoticeSchedul implements Job {
             String dealAnnouncementGuid = record.getDealAnnouncementGuid();
             if(!ObjectUtils.isEmpty(dealAnnouncementGuid)){
                 tenderDetailsVo.setTenderProjectCode(dealAnnouncementGuid);
-            }
+            }*//*
+
+
             String announcementConnect = record.getAnnouncementConnect();
             if(!ObjectUtils.isEmpty(announcementConnect)){
                 tenderDetailsVo.setNoticeContent(announcementConnect);
@@ -185,9 +277,8 @@ public class ZrzyTkqBidwinnoticeSchedul implements Job {
            }
         }
         return tenderDetailsVos;
-    }
+    }*/
 
-    @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         try {
             if(JobLock.ZrzyTdBidwinnoticeFlag){
@@ -207,7 +298,7 @@ public class ZrzyTkqBidwinnoticeSchedul implements Job {
             JobLock.ZrzyTdBidwinnoticeFlag = true;
         }
     }
-*/
+
 
 
 }

+ 1 - 0
src/main/java/com/trs/ggzyexchange/service/ZrzyTkqBidwinnoticeService.java

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ZrzyTkqBidwinnoticeService extends IService<ZrzyTkqBidwinnotice> {
 
+    Long maxDataTimeStamp();
 }

+ 19 - 0
src/main/java/com/trs/ggzyexchange/service/impl/ZrzyTkqBidwinnoticeServiceImpl.java

@@ -2,8 +2,11 @@ package com.trs.ggzyexchange.service.impl;
 
 import com.trs.ggzyexchange.entity.ZrzyTkqBidwinnotice;
 import com.trs.ggzyexchange.mapper.ZrzyTkqBidwinnoticeMapper;
+import com.trs.ggzyexchange.mapper.ZrzyTkqNoticeMapper;
 import com.trs.ggzyexchange.service.ZrzyTkqBidwinnoticeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,5 +19,21 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class ZrzyTkqBidwinnoticeServiceImpl extends ServiceImpl<ZrzyTkqBidwinnoticeMapper, ZrzyTkqBidwinnotice> implements ZrzyTkqBidwinnoticeService {
+    @Autowired
+    private ZrzyTkqBidwinnoticeMapper zrzyTkqBidwinnoticeMapper;
 
+    public Long maxDataTimeStamp() {
+        Long aLong =  zrzyTkqBidwinnoticeMapper.maxDataTimeStamp();
+        try{
+            if(!ObjectUtils.isEmpty(aLong)){
+                if(aLong != 0){
+                    String sLong = ((aLong+"").substring(0,8)) + "000000";
+                    aLong = Long.parseLong(sLong);
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return aLong;
+    }
 }

+ 5 - 0
src/main/resources/mapper/ZrzyTkqBidwinnoticeMapper.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.trs.ggzyexchange.mapper.ZrzyTkqBidwinnoticeMapper">
 
+    <select id="maxDataTimeStamp" resultType="java.lang.Long">
+
+        select max(DATA_TIMESTAMP) from zrzy_tkq_bidwinnotice
+
+    </select>
 </mapper>