From 8cc71cee5f372556f498e96c767d0ea2d1909f09 Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Thu, 29 Jun 2023 19:52:58 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E4=BF=AE=E6=94=B9=E7=AB=99=E7=82=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A1=AB=E6=8A=A5=E6=97=B6=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E8=87=B3FDP=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hnac/hzims/operational/station/StationConstants.java  | 7 +++++++
 .../hzims/operational/station/service/impl/StationServiceImpl.java | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/StationConstants.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/StationConstants.java
index 48ad9d1..e42046c 100644
--- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/StationConstants.java
+++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/StationConstants.java
@@ -15,6 +15,13 @@ public interface StationConstants {
 	String HZ3000_OTHER = "5";
 	/*==============================================================================================*/
 
+	/*==============================================================================================*/
+	/**数据填报**/
+	String FILL = "1";
+	/**数据采集**/
+	String GATHER = "0";
+	/*==============================================================================================*/
+
 	String STATION_VIDEO_TYPE_CODE = "vedio_address_type";
 
 	//自动添加或修改机构数据
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
index 931484d..d0e1d0a 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
@@ -97,7 +97,7 @@ public class StationServiceImpl extends BaseServiceImpl<StationMapper, StationEn
             throw new ServiceException("创建/修改站点信息失败！");
         });
         // 如果设备数据来源未选定其他 则进行站点初始化操作
-        if (!StationConstants.HZ3000_OTHER.equals(req.getDataSource())) {
+        if (!(StationConstants.FILL.equals(req.getDataOrigin()) || StationConstants.HZ3000_OTHER.equals(req.getDataSource()))) {
             new Thread(() -> questionClient.submitStationInfo(req.getCode(), ""), "智能诊断站点推送").start();
             new Thread(() -> this.instanceProject(req), "新建项目").start();
         }