admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2023-12-20 15:03:50 +08:00
parent 32e2972ff3
commit c834eadaef
3 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/GantryCraneCurrentData.java
View File

@ -262,14 +262,30 @@ public class GantryCraneCurrentData implements Serializable {
@ApiModelProperty(value = "当前工作天数 天") @ApiModelProperty(value = "当前工作天数 天")
private java.lang.String powerOnDay; private java.lang.String powerOnDay;
/** /**
* 当前工作时分秒 HH:MM:SS * 当前工作时分秒 HH:MM:SS
*/ */
@Excel(name = "当前工作时分秒 HH:MM:SS", width = 15) @Excel(name = "当前工作时分秒 HH:MM:SS", width = 15)
@ApiModelProperty(value = "当前工作时分秒 HH:MM:SS") @ApiModelProperty(value = "当前工作时分秒 HH:MM:SS")
private java.lang.String powerOnTimes; private java.lang.String powerOnTimes;
@TableField(exist = false) @TableField(exist = false)
private java.lang.String fieldAcquisitionUrl; private java.lang.String fieldAcquisitionUrl;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "风速等级") @ApiModelProperty(value = "风速等级")
private java.lang.String windSpeedLevel; 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;
} }

6
src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneCurrentDataMapper.xml
View File

@ -3,9 +3,13 @@
<mapper namespace="com.zhgd.xmgl.modules.bigdevice.mapper.GantryCraneCurrentDataMapper"> <mapper namespace="com.zhgd.xmgl.modules.bigdevice.mapper.GantryCraneCurrentDataMapper">
<select id="getNewestGantryCraneCurrentData" <select id="getNewestGantryCraneCurrentData"
resultType="com.zhgd.xmgl.modules.bigdevice.entity.GantryCraneCurrentData"> 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 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) 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} WHERE a.dev_sn=#{devSn}
ORDER BY a.recive_time DESC ORDER BY a.recive_time DESC
LIMIT 1 LIMIT 1

2
src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneCurrentDataServiceImpl.java
View File

@ -60,7 +60,7 @@ public class GantryCraneCurrentDataServiceImpl extends ServiceImpl<GantryCraneCu
@Override @Override
public GantryCraneCurrentData getNewestGantryCraneCurrentData(Map<String, Object> map) { public GantryCraneCurrentData getNewestGantryCraneCurrentData(Map<String, Object> map) {
GantryCraneCurrentData data = gantryCraneCurrentDataMapper.getNewestGantryCraneCurrentData(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()))); data.setWindSpeedLevel(AqiUtil.getWindSpeedLevel(Double.valueOf(data.getWindSpeed())));
} }
return data; return data;