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

代码优化

Browse Source
This commit is contained in:
Administrator 2023-03-02 19:03:59 +08:00
parent 5d8a3706f7
commit c95e05f131
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/environment/controller/EnvironmentAlarmController.java
View File

@ -114,7 +114,7 @@ public class EnvironmentAlarmController {
*/
@ApiOperation(value = "查询某个项目今日PM10报警/预警情况", notes = "查询某个项目今日PM10报警/预警情况", httpMethod = "POST")
@PostMapping(value = "/queryProjectTodayAlarmInfoDetail")
public Result<ProjectTodayAlarmInfoDetailVo> queryProjectTodayAlarmInfoDetail(ProjectTodayAlarmInfoDetailQO qo) {
public Result<ProjectTodayAlarmInfoDetailVo> queryProjectTodayAlarmInfoDetail(@RequestBody @Validated ProjectTodayAlarmInfoDetailQO qo) {
return Result.success(environmentAlarmService.queryProjectTodayAlarmInfoDetail(qo));
}

5
src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoDetailQO.java
View File

@ -4,9 +4,12 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
@ApiModel("查询某个项目今日PM10报警/预警情况")
public class ProjectTodayAlarmInfoDetailQO {
@ApiModelProperty(value = "所属项目SN")
@ApiModelProperty(value = "所属项目SN", required = true)
@NotBlank
private String projectSn;
}

6
src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml
View File

@ -339,7 +339,7 @@
</select>
<select id="queryDeviceTodayAvgData" resultType="com.zhgd.xmgl.modules.environment.entity.Pm10TodayData"
parameterType="com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoDetailQO">
SELECT AVG(dnd.pm10),
SELECT AVG(dnd.pm10) pm10,
dnd.upload_date
FROM dust_noise_data dnd
WHERE dnd.project_sn = #{projectSn}
@ -355,8 +355,10 @@
IF
(ea.type = 0, 1, 0)), 0) pm10_device_today_pre_alarm_sum
FROM environment_alarm ea
WHERE DATE_FORMAT(ea.alarm_time, "%Y%m%d") = DATE_FORMAT(NOW(), "%Y%m%d")
<where>
DATE_FORMAT(ea.alarm_time, "%Y%m%d") = DATE_FORMAT(NOW(), "%Y%m%d")
AND ea.alarm_type_id = 2
AND ea.project_sn = #{projectSn}
</where>
</select>
</mapper>