diff --git a/src/main/java/com/bonus/aqd/base/dao/DevDataMapper.java b/src/main/java/com/bonus/aqd/base/dao/DevDataMapper.java index db1be78..48b39b4 100644 --- a/src/main/java/com/bonus/aqd/base/dao/DevDataMapper.java +++ b/src/main/java/com/bonus/aqd/base/dao/DevDataMapper.java @@ -1,6 +1,7 @@ package com.bonus.aqd.base.dao; import com.bonus.aqd.base.entity.DevVO; +import com.bonus.aqd.base.entity.vo.WarnInfoVo; import org.springframework.stereotype.Repository; /** @@ -29,4 +30,9 @@ public interface DevDataMapper { */ void downDevStatus(DevVO devVO); + /** + * 告警数据插入 + * @param warnInfoVo + */ + void insertWarnInfo(WarnInfoVo warnInfoVo); } diff --git a/src/main/java/com/bonus/aqd/base/service/impl/IndexServiceImpl.java b/src/main/java/com/bonus/aqd/base/service/impl/IndexServiceImpl.java index cdb0ccf..8361389 100644 --- a/src/main/java/com/bonus/aqd/base/service/impl/IndexServiceImpl.java +++ b/src/main/java/com/bonus/aqd/base/service/impl/IndexServiceImpl.java @@ -49,14 +49,12 @@ public class IndexServiceImpl implements IndexService { List list = new ArrayList<>(); try { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - list = mapper.getDevicesInfo(dto); if(CollectionUtils.isNotEmpty(list)){ list.forEach(vo->{ try { - if("1".equals(vo.getDevStatus())){ - Date date = sdf.parse("2024-07-31 09:20:30"); + if("1".equals(vo.getDevStatus().toString())){ + Date date = sdf.parse(vo.getStateTime()); String time =getDatePoor(date); vo.setOnlineTime(time); }else{ diff --git a/src/main/java/com/bonus/aqd/tcpservice/SaveDataService.java b/src/main/java/com/bonus/aqd/tcpservice/SaveDataService.java index 3e63bb4..c118d04 100644 --- a/src/main/java/com/bonus/aqd/tcpservice/SaveDataService.java +++ b/src/main/java/com/bonus/aqd/tcpservice/SaveDataService.java @@ -5,6 +5,7 @@ import com.bonus.aqd.base.dao.IndexMapper; import com.bonus.aqd.base.entity.DevVO; import com.bonus.aqd.base.entity.dto.ParamsDto; import com.bonus.aqd.base.entity.vo.DeviceInfoVo; +import com.bonus.aqd.base.entity.vo.WarnInfoVo; import com.bonus.aqd.manager.common.util.DateTimeHelper; import com.bonus.aqd.manager.common.util.StringHelper; import com.bonus.aqd.manager.core.dao.SysUserDao; @@ -111,6 +112,7 @@ public class SaveDataService { //传输类型 // Integer direction = Integer.parseInt(msg.substring(10, 12), 16); Integer warn = Integer.parseInt(msg.substring(12, 14), 16); + DevVO VO = new DevVO(); VO.setDevCode(devCode); VO.setWarnInfo(warn.toString()); @@ -119,7 +121,9 @@ public class SaveDataService { VO.setDevB("1"); mapper.updateData(VO); } else if (type == 17) { + WarnInfoVo warnInfoVo=new WarnInfoVo(); String time=DateTimeHelper.getNowTime(); + warnInfoVo.setDevCode(devCode); if (warn == 0) { VO.setDevA("1"); VO.setDevB("1"); @@ -127,15 +131,25 @@ public class SaveDataService { VO.setDevA("0"); VO.setDevB("1"); VO.setDevAtime(time); + warnInfoVo.setWarnContent("A钩脱落"); + warnInfoVo.setWarnReason("单钩-A钩脱落"); + warnInfoVo.setDevModule("单钩"); } else if (warn == 2) { VO.setDevA("1"); VO.setDevB("0"); VO.setDevBtime(time); + warnInfoVo.setWarnContent("B钩脱落"); + warnInfoVo.setWarnReason("单钩-B钩脱落"); + warnInfoVo.setDevModule("单钩"); } else if (warn == 3) { VO.setDevA("0"); VO.setDevB("0"); VO.setDevAtime(time); VO.setDevBtime(time); + warnInfoVo.setWarnContent("双钩脱落"); + warnInfoVo.setWarnReason("双钩-双钩脱落"); + warnInfoVo.setDevModule("双钩"); + mapper.insertWarnInfo(warnInfoVo); } mapper.updateData(VO); } diff --git a/src/main/resources/mappers/base/DevDataMapper.xml b/src/main/resources/mappers/base/DevDataMapper.xml index 49b66c5..6c8c37b 100644 --- a/src/main/resources/mappers/base/DevDataMapper.xml +++ b/src/main/resources/mappers/base/DevDataMapper.xml @@ -2,6 +2,12 @@ + + insert into tb_warn ( + dev_code, warn_content, + warn_time,warn_reason, dev_module + )values (#{devCode} ,#{warnContent},now(),#{warnReason},#{devModule}) + diff --git a/src/main/resources/mappers/base/IndexMapper.xml b/src/main/resources/mappers/base/IndexMapper.xml index 503ede8..23da20c 100644 --- a/src/main/resources/mappers/base/IndexMapper.xml +++ b/src/main/resources/mappers/base/IndexMapper.xml @@ -73,7 +73,7 @@ dev_code AS devCode, dev_modu AS devModu, puid, - warn_info + warn_info warnInfo FROM tb_device WHERE id = #{id}