From 606c048d493becbec0150f5985baee050f37852b Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Tue, 16 Jan 2024 14:13:15 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pitchmixstation/entity/PitchMixStationDev.java       | 9 +++++----
 .../service/impl/ProjectUfaceConfigServiceImpl.java      | 6 +++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/entity/PitchMixStationDev.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/entity/PitchMixStationDev.java
index cf661ceb8..a16033ad7 100644
--- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/entity/PitchMixStationDev.java
+++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/entity/PitchMixStationDev.java
@@ -81,11 +81,12 @@ public class PitchMixStationDev implements Serializable {
     @ApiModelProperty(value = "拌合站位置")
     private java.lang.String mixingStationLocation;
     /**
-     * 负责人
+     * 负责人id
      */
-    @Excel(name = "负责人", width = 15)
-    @ApiModelProperty(value = "负责人")
-    private java.lang.String personInCharge;
+    @ApiModelProperty(value = "负责人id")
+    private java.lang.Long dutyUserId;
+    @ApiModelProperty(value = "负责人名称")
+    private java.lang.String dutyUserName;
     /**
      * 负责人电话
      */
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java
index 7d8b7988a..6410ea471 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java
@@ -302,10 +302,14 @@ public class ProjectUfaceConfigServiceImpl extends ServiceImpl<ProjectUfaceConfi
                 devIdBuilder.append(dev.getDeviceId());
             }
         }
-        sendDev(projectUfaceConfig, workerInfo, devBuilder.toString(), devIdBuilder.toString());
+        String devSn = devBuilder.toString();
+        String devId = devIdBuilder.toString();
+        log.info("devSn:{},devId:{}", devSn, devId);
+        sendDev(projectUfaceConfig, workerInfo, devSn, devId);
     }
 
     public void sendDev(ProjectUfaceConfig tempProjectUfaceConfig, WorkerInfo workerInfo, String devSn, String devId) {
+        log.info("supplierType:{}", tempProjectUfaceConfig.getSupplierType());
         //1杭州宇泛智能科技,2用jdpush推送,3.mqtt,4.芊熠智能,5佳信捷,6佳信捷新设备
         if (tempProjectUfaceConfig.getSupplierType() == 1) {
             String image = "";