From c834eadaefea407f9dbe665fef42eaf3b98c98a7 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Wed, 20 Dec 2023 15:03:50 +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

---
 .../entity/GantryCraneCurrentData.java        | 36 +++++++++++++------
 .../xml/GantryCraneCurrentDataMapper.xml      |  6 +++-
 .../GantryCraneCurrentDataServiceImpl.java    |  2 +-
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/GantryCraneCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/GantryCraneCurrentData.java
index bb9c083c0..cc50a7cf4 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/GantryCraneCurrentData.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/GantryCraneCurrentData.java
@@ -262,14 +262,30 @@ public class GantryCraneCurrentData implements Serializable {
     @ApiModelProperty(value = "当前工作天数 天")
     private java.lang.String powerOnDay;
     /**
-     * 当前工作时分秒 HH:MM:SS
-     */
-    @Excel(name = "当前工作时分秒 HH:MM:SS", width = 15)
-    @ApiModelProperty(value = "当前工作时分秒 HH:MM:SS")
-    private java.lang.String powerOnTimes;
-    @TableField(exist = false)
-    private java.lang.String fieldAcquisitionUrl;
-    @TableField(exist = false)
-    @ApiModelProperty(value = "风速等级")
-    private java.lang.String windSpeedLevel;
+	 * 当前工作时分秒 HH:MM:SS
+	 */
+	@Excel(name = "当前工作时分秒 HH:MM:SS", width = 15)
+	@ApiModelProperty(value = "当前工作时分秒 HH:MM:SS")
+	private java.lang.String powerOnTimes;
+	@TableField(exist = false)
+	private java.lang.String fieldAcquisitionUrl;
+	@TableField(exist = false)
+	@ApiModelProperty(value = "风速等级")
+	private java.lang.String windSpeedLevel;
+	@TableField(exist = false)
+	@ApiModelProperty(value = "性别名称")
+	private java.lang.String gender;
+	@TableField(exist = false)
+	@ApiModelProperty(value = "班组名称")
+	private java.lang.String teamName;
+	@TableField(exist = false)
+	@ApiModelProperty(value = "工种名称")
+	private java.lang.String workerTypeName;
+	@TableField(exist = false)
+	@ApiModelProperty(value = "参建单位名称")
+	private java.lang.String enterpriseName;
+	@TableField(exist = false)
+	@ApiModelProperty(value = "手机号")
+	private java.lang.String phoneNumber;
+
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneCurrentDataMapper.xml
index 87da0eec5..3f6f40e5f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneCurrentDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneCurrentDataMapper.xml
@@ -3,9 +3,13 @@
 <mapper namespace="com.zhgd.xmgl.modules.bigdevice.mapper.GantryCraneCurrentDataMapper">
     <select id="getNewestGantryCraneCurrentData"
             resultType="com.zhgd.xmgl.modules.bigdevice.entity.GantryCraneCurrentData">
-        SELECT a.*,b.field_acquisition_url
+        SELECT a.*,b.field_acquisition_url,ti.team_name,wt.type_name as workerTypeName,if(b.sex=1,"男","女")
+        gender,ei.enterprise_name,b.phone_number
         from gantry_crane_current_data a LEFT JOIN worker_info b ON (a.project_sn=b.project_sn and
         a.driver_id_card=b.id_card)
+        left join team_info ti on ti.id=b.team_id and ti.project_sn=b.project_sn
+        left join worker_type wt on wt.id=ti.worker_type_id and wt.project_sn=b.project_sn
+        left join enterprise_info ei on ei.id=b.enterprise_id
         WHERE a.dev_sn=#{devSn}
         ORDER BY a.recive_time DESC
         LIMIT 1
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneCurrentDataServiceImpl.java
index 62e56ba12..61224515e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneCurrentDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneCurrentDataServiceImpl.java
@@ -60,7 +60,7 @@ public class GantryCraneCurrentDataServiceImpl extends ServiceImpl<GantryCraneCu
     @Override
     public GantryCraneCurrentData getNewestGantryCraneCurrentData(Map<String, Object> map) {
         GantryCraneCurrentData data = gantryCraneCurrentDataMapper.getNewestGantryCraneCurrentData(map);
-        if (StringUtils.isNotBlank(data.getWindSpeed())) {
+        if (data != null && StringUtils.isNotBlank(data.getWindSpeed())) {
             data.setWindSpeedLevel(AqiUtil.getWindSpeedLevel(Double.valueOf(data.getWindSpeed())));
         }
         return data;