adu 3 years ago
parent
commit
493b8be1ed

BIN
.gradle/5.2.1/executionHistory/executionHistory.bin


BIN
.gradle/5.2.1/executionHistory/executionHistory.lock


BIN
.gradle/5.2.1/fileHashes/fileHashes.bin


BIN
.gradle/5.2.1/fileHashes/fileHashes.lock


BIN
.gradle/5.2.1/javaCompile/javaCompile.lock


BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock


+ 2 - 2
.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri Aug 05 16:40:26 GMT+08:00 2022
-gradle.version=6.7
+#Tue Aug 09 09:18:44 CST 2022
+gradle.version=5.2.1

BIN
.gradle/buildOutputCleanup/outputFiles.bin


+ 160 - 0
src/main/java/com/picc/grab/entity/ZbwtVo.java

@@ -0,0 +1,160 @@
+ package com.picc.grab.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class ZbwtVo{
+/*     */   private String id;
+/*     */   private String carid;
+/*     */   private Integer zbgzstatus;
+/*     */   @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+/*     */   private Date fsbjdsj;
+/*     */   private String fsr;
+/*     */   @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+/*     */   @TableField("create_time")
+/*     */   private Date createTime;
+/*     */   @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+/*     */   private Date lastgztime;
+/*     */   private String gzrwbh;
+
+    /**
+     * 中标价
+     */
+    private BigDecimal bidPrice;
+
+    /**
+     * 中标公司
+     */
+    private String bidCompanyName;
+    /**
+     * 中标时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date outbidTime;
+
+    /**
+     * 车牌号
+     */
+    private String cph;
+
+    public String getCph() {
+        return cph;
+    }
+
+    public void setCph(String cph) {
+        this.cph = cph;
+    }
+
+    public String getBidCompanyName() {
+        return bidCompanyName;
+    }
+
+    public void setBidCompanyName(String bidCompanyName) {
+        this.bidCompanyName = bidCompanyName;
+    }
+
+    public Date getOutbidTime() {
+        return outbidTime;
+    }
+
+    public void setOutbidTime(Date outbidTime) {
+        this.outbidTime = outbidTime;
+    }
+
+    public BigDecimal getBidPrice() {
+        return bidPrice;
+    }
+
+    public void setBidPrice(BigDecimal bidPrice) {
+        this.bidPrice = bidPrice;
+    }
+
+    /*     */
+/*     */   public String getId() {
+/*  67 */     return this.id;
+/*     */   }
+/*     */   
+/*     */   public void setId(String id) {
+/*  71 */     this.id = id;
+/*     */   }
+/*     */   
+/*     */   public String getCarid() {
+/*  75 */     return this.carid;
+/*     */   }
+/*     */   
+/*     */   public void setCarid(String carid) {
+/*  79 */     this.carid = carid;
+/*     */   }
+/*     */   
+/*     */   public Integer getZbgzstatus() {
+/*  83 */     return this.zbgzstatus;
+/*     */   }
+/*     */   
+/*     */   public void setZbgzstatus(Integer zbgzstatus) {
+/*  87 */     this.zbgzstatus = zbgzstatus;
+/*     */   }
+/*     */   
+/*     */   public Date getFsbjdsj() {
+/*  91 */     return this.fsbjdsj;
+/*     */   }
+/*     */   
+/*     */   public void setFsbjdsj(Date fsbjdsj) {
+/*  95 */     this.fsbjdsj = fsbjdsj;
+/*     */   }
+/*     */   
+/*     */   public String getFsr() {
+/*  99 */     return this.fsr;
+/*     */   }
+/*     */   
+/*     */   public void setFsr(String fsr) {
+/* 103 */     this.fsr = fsr;
+/*     */   }
+/*     */   
+/*     */   public Date getCreateTime() {
+/* 107 */     return this.createTime;
+/*     */   }
+/*     */   
+/*     */   public void setCreateTime(Date createTime) {
+/* 111 */     this.createTime = createTime;
+/*     */   }
+/*     */   
+/*     */   public Date getLastgztime() {
+/* 115 */     return this.lastgztime;
+/*     */   }
+/*     */   
+/*     */   public void setLastgztime(Date lastgztime) {
+/* 119 */     this.lastgztime = lastgztime;
+/*     */   }
+/*     */ 
+/*     */   
+/*     */   protected Serializable pkVal() {
+/* 124 */     return this.id;
+/*     */   }
+/*     */   
+/*     */   public String getGzrwbh() {
+/* 128 */     return this.gzrwbh;
+/*     */   }
+/*     */   
+/*     */   public void setGzrwbh(String gzrwbh) {
+/* 132 */     this.gzrwbh = gzrwbh;
+/*     */   }
+/*     */ 
+/*     */   
+/*     */   public String toString() {
+/* 137 */     return "Zbwt{id=" + this.id + ", carid=" + this.carid + ", zbgzstatus=" + this.zbgzstatus + ", fsbjdsj=" + this.fsbjdsj + ", fsr=" + this.fsr + ", createTime=" + this.createTime + ", gzrwbh=" + this.gzrwbh + "}";
+/*     */   }
+/*     */ }
+
+
+/* Location:              C:\Users\Administrator\Desktop\ROOT\WEB-INF\classes\!\com\picc\grab\domain\Zbwt.class
+ * Java compiler version: 8 (52.0)
+ * JD-Core Version:       1.1.3
+ */

+ 2 - 2
src/main/java/com/picc/grab/mapper/PiccgrabaccountMapper.java

@@ -3,6 +3,7 @@ package com.picc.grab.mapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.picc.grab.domain.Piccgrabaccount;
+import com.picc.grab.domain.Zbwt;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
@@ -11,6 +12,5 @@ public interface PiccgrabaccountMapper extends BaseMapper<Piccgrabaccount> {
 
   List<String> findTokenByLogIn();
 
-
-  List<String> getCarIds(@Param("carNo") String carNo);
+  List<Zbwt> getZbwt(@Param("carNo") String carNo);
 }

+ 9 - 0
src/main/java/com/picc/grab/mapper/ZbwtMapper.java

@@ -2,9 +2,11 @@ package com.picc.grab.mapper;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.picc.grab.domain.Zbwt;
+import com.picc.grab.entity.ZbwtVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 public interface ZbwtMapper extends BaseMapper<Zbwt> {
   Zbwt GetZbwtByCarid(String paramString);
@@ -15,4 +17,11 @@ public interface ZbwtMapper extends BaseMapper<Zbwt> {
                   @Param("bidCompanyName") String bidCompanyName,
                   @Param("createTime") String createTime,
                   @Param("bidPrice") BigDecimal bidPrice);
+
+  /**
+   * 根据create_time获取7天内
+   * 且zbgzstatus为1或者3
+   * @return
+   */
+  List<ZbwtVo> findByTime();
 }

+ 2 - 2
src/main/java/com/picc/grab/service/IPiccgrabaccountService.java

@@ -3,6 +3,7 @@ package com.picc.grab.service;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
 import com.picc.grab.domain.Piccgrabaccount;
+import com.picc.grab.domain.Zbwt;
 import com.picc.grab.entity.grab.dto.CrmListDTO;
 
 import java.util.List;
@@ -16,6 +17,5 @@ public interface IPiccgrabaccountService extends IService<Piccgrabaccount> {
 
   List<String> findTokenByLogIn();
 
-
-  List<String> getCarIds(String carNo);
+  List<Zbwt> getZbwt(String carNo);
 }

+ 9 - 9
src/main/java/com/picc/grab/service/impl/PiccgrabaccountServiceImpl.java

@@ -7,13 +7,13 @@
 /*     */ import com.baomidou.mybatisplus.plugins.Page;
 /*     */ import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 /*     */ import com.picc.grab.config.PiccGrabConfig;
-/*     */ import com.picc.grab.domain.Carimg;
-/*     */ import com.picc.grab.domain.Carinfo;
-/*     */ import com.picc.grab.domain.Piccgrabaccount;
-/*     */ import com.picc.grab.domain.Piccgrabparam;
-/*     */ import com.picc.grab.domain.User;
-/*     */ import com.picc.grab.domain.WtfInfo;
-/*     */ import com.picc.grab.domain.Ywypz;
+/*     */ import com.picc.grab.domain.*;
+/*     */
+/*     */
+/*     */
+/*     */
+/*     */
+/*     */
 /*     */ import com.picc.grab.entity.grab.dto.BbpAuctionSelectVoList;
 /*     */ import com.picc.grab.entity.grab.dto.CrmListDTO;
 /*     */ import com.picc.grab.entity.grab.dto.ListData;
@@ -358,8 +358,8 @@
     }
 
     @Override
-    public List<String> getCarIds(String carNo) {
-        return piccgrabaccountMapper.getCarIds(carNo);
+    public List<Zbwt> getZbwt(String carNo) {
+        return piccgrabaccountMapper.getZbwt(carNo);
     }
 
     /*     */

+ 49 - 26
src/main/java/com/picc/grab/task/SuccessfulTask.java

@@ -4,6 +4,8 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.json.JSONUtil;
 import com.picc.grab.crawl.*;
+import com.picc.grab.domain.Zbwt;
+import com.picc.grab.entity.ZbwtVo;
 import com.picc.grab.entity.common.vo.ResultVO;
 import com.picc.grab.mapper.ZbwtMapper;
 import com.picc.grab.service.ICarinfoService;
@@ -51,6 +53,11 @@ public class SuccessfulTask {
     @Transactional
     @Scheduled(cron = "0 */10 * * * ?")
     public void syncInfo() throws Exception {
+        //查询需要同步中标信息的车
+        List<ZbwtVo> zbwtList = zbwtMapper.findByTime();
+        if (CollectionUtils.isEmpty(zbwtList)){
+            return;
+        }
         //入参
         OfferPlatFromBody body = new OfferPlatFromBody();
         body.setAuctionStatus("02");
@@ -58,38 +65,54 @@ public class SuccessfulTask {
         body.setStartTime(DateUtil.format(cn.hutool.core.date.DateUtil.lastMonth(), "yyyy-MM-dd"));
         body.setEndTime(DateUtil.format(cn.hutool.core.date.DateUtil.tomorrow(), "yyyy-MM-dd"));
         List<String> tokens = piccgrabaccountService.findTokenByLogIn();
+        if (CollectionUtils.isEmpty(tokens)){
+            return;
+        }
 
-        if (CollectionUtils.isNotEmpty(tokens)) {
-            for (String token : tokens) {
-                // 获取报价完成列表的车辆
-                OfferPlatformBean platFromBean = getPlatFromBean(token, body);
-                for (OfferPlatformBean.BbpAuctionSelectVo car : platFromBean.getData().getBbpAuctionSelectVoList()) {
-                    //查询车辆详情
-                    try {
-                        BbpDetailBean detailBean = getBbpDetail(token, new BbpDetailBody(car.getId()));
-                        if (!Objects.isNull(detailBean)) {
-                            String zbgzstatus = "3";
-                            if (StringUtils.isNotBlank(detailBean.getData().getBbpWonBidVo().getBidCompanyName())
-                                    && detailBean.getData().getBbpWonBidVo().getBidCompanyName().contains("湖北同凯拍卖有限公司")){
-                                zbgzstatus = "4";
-                            }
-                            List<String> carids = piccgrabaccountService.getCarIds(car.getCarNo());
-                            //修改车辆中标信息
-                            for (String carid : carids) {
-                                zbwtMapper.updateZbwt(zbgzstatus,carid
-                                        ,detailBean.getData().getBbpWonBidVo().getBidCompanyName()
-                                        ,detailBean.getData().getBbpWonBidVo().getCreateTime()
-                                        ,detailBean.getData().getBbpWonBidVo().getBidPrice());
-                                log.info("定时任务--同步车辆中标信息,车辆id:"+carid);
-                            }
-                        }
-                    }catch (Exception e){
+        for (String token : tokens) {
+            // 获取报价完成列表的车辆
+            OfferPlatformBean platFromBean;
+            try {
+                platFromBean = getPlatFromBean(token, body);
+            }catch (Exception e){
+                continue;
+            }
+            // list转为map key为车牌号
+            Map<String, OfferPlatformBean.BbpAuctionSelectVo> map = platFromBean.getData().getBbpAuctionSelectVoList()
+                    .stream().collect(Collectors.toMap(OfferPlatformBean.BbpAuctionSelectVo::getCarNo, Function.identity(), (item1, item2) -> item1));
+            for (ZbwtVo zbwt : zbwtList) {
+                //根据车牌号获取报价完成的车辆信息
+                OfferPlatformBean.BbpAuctionSelectVo auctionSelectVo = map.get(zbwt.getCph());
+                if (Objects.isNull(auctionSelectVo)){
+                    continue;
+                }
+                try {
+                    //获取车辆详情
+                    BbpDetailBean detailBean = getBbpDetail(token, new BbpDetailBody(auctionSelectVo.getId()));
+                    if (Objects.isNull(detailBean.getData())) {
                         continue;
                     }
+                    //同步中标信息
+                    if (!Objects.isNull(detailBean.getData().getBbpWonBidVo())) {
+                        String zbgzstatus = "3";
+                        if (StringUtils.isNotBlank(detailBean.getData().getBbpWonBidVo().getBidCompanyName())
+                                && detailBean.getData().getBbpWonBidVo().getBidCompanyName().contains("湖北同凯拍卖有限公司")){
+                            zbgzstatus = "4";
+                        }
+                        zbwtMapper.updateZbwt(zbgzstatus,zbwt.getCarid()
+                                ,detailBean.getData().getBbpWonBidVo().getBidCompanyName()
+                                ,detailBean.getData().getBbpWonBidVo().getCreateTime()
+                                ,detailBean.getData().getBbpWonBidVo().getBidPrice());
+                        log.info("定时任务--同步车辆中标信息,车辆id:"+zbwt.getCarid());
+                    }
+                }catch (Exception e){
+                    continue;
                 }
 
             }
-        }
+
+
+            }
 
     }
 

+ 2 - 2
src/main/resources/xml/PiccgrabaccountMapper.xml

@@ -29,7 +29,7 @@
         select token from md_piccgrabaccount where logIn = 1
     </select>
 
-    <select id="getCarIds" resultType="java.lang.String">
-        select id FROM nj_mdb.md_carinfo where cph=#{carNo}
+    <select id="getZbwt" resultType="com.picc.grab.domain.Zbwt">
+        select * FROM nj_mdb.md_carinfo where cph=#{carNo}
     </select>
 </mapper>

+ 10 - 1
src/main/resources/xml/ZbwtMapper.xml

@@ -17,7 +17,14 @@
         select  * from  nj_mdb.md_zbwt WHERE carid=#{carid}
 	</select>
 
-    <update id="updateZbwt">
+	<select id="findByTime" resultType="com.picc.grab.entity.ZbwtVo">
+		select a.*,b.cph from nj_mdb.md_zbwt a
+		LEFT JOIN nj_mdb.md_carinfo b on b.id = a.carid
+		where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <![CDATA[<=]]> date(a.create_time)
+		and zbgzstatus in(1,3)
+	</select>
+
+	<update id="updateZbwt">
 		UPDATE md_zbwt SET zbgzstatus=#{zbgzstatus}
 		,bidCompanyName=#{bidCompanyName}
 		,outbidTime=#{createTime}
@@ -26,4 +33,6 @@
 	</update>
 
 
+
+
 </mapper>