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

bug修改

Browse Source
This commit is contained in:
Administrator 2023-05-27 19:28:31 +08:00
parent 63ee4dbc19
commit d0b61dbc31
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/zhgd/xmgl/modules/environment/entity/DustNoiseData.java
View File

@ -56,43 +56,43 @@ public class DustNoiseData implements Serializable {
/** /**
* 扬尘 * 扬尘
*/ */
@Excel(name = "扬尘", width = 15) @Excel(name = "PM10(ug/m3)", width = 15)
@ApiModelProperty(value = "扬尘") @ApiModelProperty(value = "扬尘")
private java.lang.Float pm10; private java.lang.Float pm10;
/** /**
* pm25 * pm25
*/ */
@Excel(name = "pm25", width = 15) @Excel(name = "PM2.5(ug/m3)", width = 15)
@ApiModelProperty(value = "pm25") @ApiModelProperty(value = "pm25")
private java.lang.Float pm25; private java.lang.Float pm25;
/** /**
* 噪音 * 噪音
*/ */
@Excel(name = "噪音", width = 15) @Excel(name = "噪音(dB)", width = 15)
@ApiModelProperty(value = "噪音") @ApiModelProperty(value = "噪音")
private java.lang.Float noise; private java.lang.Float noise;
/** /**
* tsp测试值 * tsp测试值
*/ */
@Excel(name = "tsp测试值", width = 15) @Excel(name = "TSP(ug/m3)", width = 15)
@ApiModelProperty(value = "tsp测试值") @ApiModelProperty(value = "tsp测试值")
private java.lang.Float tsp; private java.lang.Float tsp;
/** /**
* 温度 * 温度
*/ */
@Excel(name = "温度", width = 15) @Excel(name = "温度(℃)", width = 15)
@ApiModelProperty(value = "温度") @ApiModelProperty(value = "温度")
private java.lang.Float temperature; private java.lang.Float temperature;
/** /**
* 湿度 * 湿度
*/ */
@Excel(name = "湿度", width = 15) @Excel(name = "湿度(%RH)", width = 15)
@ApiModelProperty(value = "湿度") @ApiModelProperty(value = "湿度")
private java.lang.Float humidity; private java.lang.Float humidity;
/** /**
* 风速 * 风速
*/ */
@Excel(name = "风速", width = 15) @Excel(name = "风速(m/s)", width = 15)
@ApiModelProperty(value = "风速") @ApiModelProperty(value = "风速")
private java.lang.Float windspeed; private java.lang.Float windspeed;
/** /**

9
src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java
View File

@ -25,10 +25,7 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Arrays; import java.util.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
/** /**
* @Description: 扬尘噪声实时数据 * @Description: 扬尘噪声实时数据
@ -64,7 +61,9 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
} else { } else {
map.put("searchType", 2); map.put("searchType", 2);
} }
return dustNoiseDataMapper.selectDustNoiseData(map); List<DustNoiseData> dustNoiseDataList = dustNoiseDataMapper.selectDustNoiseData(map);
Collections.reverse(dustNoiseDataList);
return dustNoiseDataList;
} }
@Override @Override

1
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
View File

@ -524,6 +524,7 @@
INNER JOIN company b ON cp.parent_id = b.company_id INNER JOIN company b ON cp.parent_id = b.company_id
INNER JOIN enterprise_info p ON p.id = w1.enterprise_id INNER JOIN enterprise_info p ON p.id = w1.enterprise_id
Left JOIN company f ON b.parent_id = f.company_id Left JOIN company f ON b.parent_id = f.company_id
INNER JOIN project_enterprise pe ON pe.enterprise_id = p.id and a.project_sn=pe.project_sn
WHERE w1.inService_type = 1 WHERE w1.inService_type = 1
<if test="projectName != null and projectName != ''"> <if test="projectName != null and projectName != ''">
and a.project_name like CONCAT(CONCAT('%', #{projectName}), '%') and a.project_name like CONCAT(CONCAT('%', #{projectName}), '%')