From 8e4c7bd5c73b5aaf6e41c14ced5f9ad630c82b67 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Wed, 17 Jan 2024 17:13:55 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E6=96=B0=E7=94=B5=E9=80=94?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=AB=99=E7=82=B9=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/ThirdPartyStationRelationMapper.xml  |  3 +--
 .../service/impl/XDTServiceImpl.java          | 22 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/jsowell-pile/src/main/resources/mapper/pile/ThirdPartyStationRelationMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ThirdPartyStationRelationMapper.xml
index 5896d909a..75e16c71e 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/ThirdPartyStationRelationMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/ThirdPartyStationRelationMapper.xml
@@ -25,10 +25,9 @@
 
     <select id="selectThirdPartyStationRelationList" parameterType="com.jsowell.pile.domain.ThirdPartyStationRelation" resultMap="ThirdPartyStationRelationResult">
         <include refid="selectThirdPartyStationRelationVo"/>
-        <where>
+        where del_flag = '0'
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="thirdPartyType != null  and thirdPartyType != ''"> and third_party_type = #{thirdPartyType}</if>
-        </where>
     </select>
 
     <select id="selectThirdPartyStationRelationById" parameterType="Long" resultMap="ThirdPartyStationRelationResult">
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java
index 130927bce..16d71a5d5 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java
@@ -3,9 +3,12 @@ package com.jsowell.thirdparty.xindiantu.service.impl;
 import com.jsowell.common.enums.thirdparty.ThirdPartyOperatorIdEnum;
 import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
 import com.jsowell.common.util.StringUtils;
+import com.jsowell.pile.domain.PileStationInfo;
 import com.jsowell.pile.domain.ThirdPartyStationRelation;
 import com.jsowell.pile.dto.*;
+import com.jsowell.pile.service.PileStationInfoService;
 import com.jsowell.pile.service.ThirdPartyStationRelationService;
+import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
 import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO;
 import com.jsowell.thirdparty.xindiantu.service.XDTService;
 import com.jsowell.thirdparty.zhongdianlian.dto.ZDLGetTokenDTO;
@@ -33,6 +36,12 @@ public class XDTServiceImpl implements XDTService {
     @Autowired
     private ThirdPartyStationRelationService relationService;
 
+    @Autowired
+    private PileStationInfoService pileStationInfoService;
+
+    @Autowired
+    private ThirdPartyStationRelationService thirdPartyStationRelationService;
+
     /**
      * 获取令牌
      * @param dto
@@ -191,6 +200,17 @@ public class XDTServiceImpl implements XDTService {
 
     @Override
     public String pushStationInfo(PushStationInfoDTO dto) {
-        return zdlService.pushStationInfo(dto);
+        // 通过站点id查询相关配置信息
+        ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
+        relation.setStationId(dto.getStationId());
+        ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
+        if (relationInfo == null) {
+            // 新增
+            relation.setThirdPartyType(dto.getThirdPartyType());
+            thirdPartyStationRelationService.insertThirdPartyStationRelation(relation);
+
+            return "OK";
+        }
+        return "Error";
     }
 }