opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-18 17:38:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

设备日志修改

Browse Source
This commit is contained in:
zzc 2024-08-20 23:05:32 +08:00
parent a878b7de90
commit d33ccbc09a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
View File

@ -223,9 +223,14 @@ public class EqDeviceController extends BaseController {
//更新开合度状态到设备
eqEquipmentBo.setEquipmentId(eqEquipmentVo.getEquipmentId());
eqEquipmentBo.setStatus(eqEquipmentLogBo.getOpenStatus());
eqEquipmentBo.setFaultStatus(eqEquipmentBo.getFaultStatus());
eqEquipmentBo.setLineStatus(eqEquipmentBo.getLineStatus());
// eqEquipmentBo.setStatus(eqEquipmentLogBo.getOpenStatus());//该参数暂时无用
if (status == 500||status==501){
eqEquipmentBo.setLineStatus(status-500);
}
if (status>=10&&status<=14){
eqEquipmentBo.setFaultStatus(eqEquipmentBo.getFaultStatus());
}
eqEquipmentService.updateByBo(eqEquipmentBo);
}

2
ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentLogServiceImpl.java
View File

@ -78,7 +78,7 @@ public class EqEquipmentLogServiceImpl implements IEqEquipmentLogService {
lqw.eq(bo.getStatus() != null, EqEquipmentLog::getStatus, bo.getStatus());
lqw.eq(bo.getFaultStatus() != null, EqEquipmentLog::getFaultStatus, bo.getFaultStatus());
lqw.eq(bo.getLineStatus() != null, EqEquipmentLog::getLineStatus, bo.getLineStatus());
lqw.eq(bo.getCreatedYearDay() != null, EqEquipmentLog::getCreatedYearDay, bo.getCreatedYearDay());
lqw.eq(StringUtils.isNotBlank(bo.getCreatedYearDay()), EqEquipmentLog::getCreatedYearDay, bo.getCreatedYearDay());
lqw.eq(bo.getCreatedHourSecond() != null, EqEquipmentLog::getCreatedHourSecond, bo.getCreatedHourSecond());
lqw.eq(bo.getDayOfWeek() != null, EqEquipmentLog::getDayOfWeek, bo.getDayOfWeek());
// lqw.between(params.get("beginTime") != null && params.get("endTime") != null,