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

bug修复

Browse Source
This commit is contained in:
guo 2024-03-18 18:32:55 +08:00
parent 88be126b4e
commit 1cff7d8e18
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java
View File

@ -96,7 +96,7 @@ public class CarPassRecordController {
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "type", value = "1今日2历史", paramType = "body", required = true, dataType = "Integer"), @ApiImplicitParam(name = "timeType", value = "1今日2历史", paramType = "body", required = true, dataType = "Integer"),
}) })
@PostMapping(value = {"/list", "/page"}) @PostMapping(value = {"/list", "/page"})
public Result<IPage<CarPassRecord>> queryPageList(@RequestBody Map<String, Object> map) { public Result<IPage<CarPassRecord>> queryPageList(@RequestBody Map<String, Object> map) {

2
src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml
View File

@ -186,7 +186,7 @@
<if test="param.type != null"> <if test="param.type != null">
and a.type = #{param.type} and a.type = #{param.type}
</if> </if>
<if test="param.type == '1'.toString()"> <if test="timeType.type == '1'.toString()">
and a.pass_time >= current_date and a.pass_time >= current_date
</if> </if>
order by a.pass_time desc order by a.pass_time desc

5
src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevMapper.xml
View File

@ -2,7 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.smoke.mapper.SmokeDevMapper"> <mapper namespace="com.zhgd.xmgl.modules.smoke.mapper.SmokeDevMapper">
<select id="queryWrapper" resultType="com.zhgd.xmgl.modules.smoke.entity.SmokeDev"> <select id="queryWrapper" resultType="com.zhgd.xmgl.modules.smoke.entity.SmokeDev">
select sd.*,ti.team_name dutyTeamInfoName,1 online select sd.*,ti.team_name dutyTeamInfoName,IFNULL(((case
when round((UNIX_TIMESTAMP(now()) - UNIX_TIMESTAMP(upload_date)) / 60) &lt;= 2880
then 1
else 0 end)),0) online
from smoke_dev sd left join team_info from smoke_dev sd left join team_info
ti on ti.id=sd.duty_team_info_id ti on ti.id=sd.duty_team_info_id
${ew.customSqlSegment} ${ew.customSqlSegment}

7
src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java
View File

@ -51,8 +51,12 @@ public class SmokeDevAlarmServiceImpl extends ServiceImpl<SmokeDevAlarmMapper, S
log.error("设备不存在"); log.error("设备不存在");
return "1"; return "1";
} }
smokeDev.setUploadDate(new Date()); Date date = new Date();
if (Objects.equals(dto.getAlarm(), 2)) {
//心跳
smokeDev.setUploadDate(date);
smokeDevMapper.updateById(smokeDev); smokeDevMapper.updateById(smokeDev);
} else if (Objects.equals(dto.getAlarm(), 1)) {
SmokeDevAlarm smokeDevAlarm = new SmokeDevAlarm(); SmokeDevAlarm smokeDevAlarm = new SmokeDevAlarm();
smokeDevAlarm.setDevSn(deviceid); smokeDevAlarm.setDevSn(deviceid);
smokeDevAlarm.setAlarmTime(new Date(Long.valueOf(dto.getTime()))); smokeDevAlarm.setAlarmTime(new Date(Long.valueOf(dto.getTime())));
@ -60,6 +64,7 @@ public class SmokeDevAlarmServiceImpl extends ServiceImpl<SmokeDevAlarmMapper, S
smokeDevAlarm.setProjectSn(smokeDev.getProjectSn()); smokeDevAlarm.setProjectSn(smokeDev.getProjectSn());
smokeDevAlarm.setAlarmDetailStatus(dto.getState()); smokeDevAlarm.setAlarmDetailStatus(dto.getState());
smokeDevAlarmMapper.insert(smokeDevAlarm); smokeDevAlarmMapper.insert(smokeDevAlarm);
}
return "0"; return "0";
} }