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

bug修复

Browse Source
This commit is contained in:
guo 2023-08-04 18:28:39 +08:00
parent a291a0bb13
commit 7941bd4d0f
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zhgd/xmgl/modules/frontier/mapper/xml/FrontierProtectionDevAlarmMapper.xml
View File

@ -2,8 +2,11 @@
<!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.frontier.mapper.FrontierProtectionDevAlarmMapper"> <mapper namespace="com.zhgd.xmgl.modules.frontier.mapper.FrontierProtectionDevAlarmMapper">
<select id="queryPageList" resultType="com.zhgd.xmgl.modules.frontier.entity.FrontierProtectionDevAlarm"> <select id="queryPageList" resultType="com.zhgd.xmgl.modules.frontier.entity.FrontierProtectionDevAlarm">
select fpda.*,fpd.dev_name,fpd.location from frontier_protection_dev_alarm fpda join frontier_protection_dev fpd select fpda.*, fpd.dev_name, fpd.location,su.account operateName
on fpd.dev_sn=fpda.dev_sn from frontier_protection_dev_alarm fpda
join frontier_protection_dev fpd
on fpd.dev_sn = fpda.dev_sn
join system_user su on su.user_id = fpda.operate_id
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
</mapper> </mapper>

7
src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevAlarmMapper.xml
View File

@ -2,8 +2,11 @@
<!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.poisonous.mapper.PoisonousGasDevAlarmMapper"> <mapper namespace="com.zhgd.xmgl.modules.poisonous.mapper.PoisonousGasDevAlarmMapper">
<select id="queryPageList" resultType="com.zhgd.xmgl.modules.poisonous.entity.PoisonousGasDevAlarm"> <select id="queryPageList" resultType="com.zhgd.xmgl.modules.poisonous.entity.PoisonousGasDevAlarm">
select pgda.*,pgd.dev_name,pgd.location from poisonous_gas_dev_alarm pgda join poisonous_gas_dev pgd on select pgda.*, pgd.dev_name, pgd.location,su.account operateName
pgd.dev_sn=pgda.dev_sn from poisonous_gas_dev_alarm pgda
join poisonous_gas_dev pgd on
pgd.dev_sn = pgda.dev_sn
join system_user su on su.user_id=pgda.operate_id
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
</mapper> </mapper>

3
src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevAlarmMapper.xml
View File

@ -2,9 +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.SmokeDevAlarmMapper"> <mapper namespace="com.zhgd.xmgl.modules.smoke.mapper.SmokeDevAlarmMapper">
<select id="queryPageList" resultType="com.zhgd.xmgl.modules.smoke.entity.SmokeDevAlarm"> <select id="queryPageList" resultType="com.zhgd.xmgl.modules.smoke.entity.SmokeDevAlarm">
select sda.*, sd.location,sd.dev_name select sda.*, sd.location,sd.dev_name,su.account operateName
from smoke_dev_alarm sda from smoke_dev_alarm sda
join smoke_dev sd on sda.dev_sn = sd.dev_sn join smoke_dev sd on sda.dev_sn = sd.dev_sn
join system_user su on su.user_id=sda.operate_id
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
</mapper> </mapper>

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

@ -43,7 +43,8 @@ public class SmokeDevAlarmServiceImpl extends ServiceImpl<SmokeDevAlarmMapper, S
String deviceid = dto.getDeviceid(); String deviceid = dto.getDeviceid();
SmokeDev smokeDev = smokeDevMapper.selectOne(new LambdaQueryWrapper<SmokeDev>().eq(SmokeDev::getDevSn, deviceid)); SmokeDev smokeDev = smokeDevMapper.selectOne(new LambdaQueryWrapper<SmokeDev>().eq(SmokeDev::getDevSn, deviceid));
if (smokeDev == null) { if (smokeDev == null) {
throw new OpenAlertException("设备不存在"); log.error("设备不存在");
return "1";
} }
smokeDev.setUploadDate(new Date()); smokeDev.setUploadDate(new Date());
smokeDevMapper.updateById(smokeDev); smokeDevMapper.updateById(smokeDev);
@ -54,7 +55,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 "1"; return "0";
} }
@Override @Override