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 2025-01-04 00:22:31 +08:00
parent ff1006b8e9
commit 194ac00091
4 changed files with 96 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,6 +243,37 @@ public class EqDeviceController extends BaseController {
return rowsData.stream().collect(Collectors.groupingBy(EqEquipmentLogVo::getCreatedYearDay));
}
/**
* 状态 eq_status_log_type
*
* 0.停止中 stop
* 1.关闭中 closing
* 2.开启中 openning
*
* 10.无异常 none
* 11.红外故障 irException
* 12.电机运转故障 motorRunException
* 13.电机维护故障 motorMaintainException
* 14.设备故障 deviceException
*
* 101.烟雾报警
* 102.红外触发报警
* 103.电机运行报警
* 104.电机维修报警
* 105.非APP开门提醒
* 106.非APP关门提醒
* 107.关门故障报警
* 108.开门故障报警
* 109.开门运行提醒
* 110.关门运行提醒
* 111.忘记关门提醒
* 112.门体手动开启提醒
* 113.半开门运行提醒
* 114.门体停止运行提醒
*
* 500.设备离线 offline
* 501.设备在线 online
*/
/**
* 保存日志(iot使用 设备状态变动时会触发该状态)
* @param eqEquipmentLogBo
@ -288,7 +319,10 @@ public class EqDeviceController extends BaseController {
eqEquipmentLogBo.setDayOfWeek(dayOfWeek - 1);// Calendar类中星期日为1，星期一为2，依此类推
//更新状态
logService.insertByBo(eqEquipmentLogBo);
if(!(status==0 ||status==108 ||status==109 ||status==110 ||status==111 ||status==112 ||status==113||status==114||status==500||status==501) )
{
logService.insertByBo(eqEquipmentLogBo);
}
//更新开合度状态到设备
eqEquipmentBo.setEquipmentId(eqEquipmentVo.getEquipmentId());
@ -299,7 +333,7 @@ public class EqDeviceController extends BaseController {
if (status>=10&&status<=14){
eqEquipmentBo.setFaultStatus(eqEquipmentBo.getFaultStatus());
}
eqEquipmentBo.setStatus(status);
eqEquipmentService.updateByBo(eqEquipmentBo);
}

25
ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqTextController.java
View File

@ -213,6 +213,31 @@ public class EqTextController extends BaseController {
));
//《数据日志》log
result.put("logStatus",Arrays.asList(
MessageUtils.message("logStatus.name0"),
MessageUtils.message("logStatus.name1"),
MessageUtils.message("logStatus.name2"),
MessageUtils.message("logStatus.name10"),
MessageUtils.message("logStatus.name11"),
MessageUtils.message("logStatus.name12"),
MessageUtils.message("logStatus.name13"),
MessageUtils.message("logStatus.name14"),
MessageUtils.message("logStatus.name101"),
MessageUtils.message("logStatus.name102"),
MessageUtils.message("logStatus.name103"),
MessageUtils.message("logStatus.name104"),
MessageUtils.message("logStatus.name105"),
MessageUtils.message("logStatus.name106"),
MessageUtils.message("logStatus.name107"),
MessageUtils.message("logStatus.name108"),
MessageUtils.message("logStatus.name109"),
MessageUtils.message("logStatus.name110"),
MessageUtils.message("logStatus.name111"),
MessageUtils.message("logStatus.name112"),
MessageUtils.message("logStatus.name113"),
MessageUtils.message("logStatus.name114")
));
result.put("log",Arrays.asList(
MessageUtils.message("log.name0"),
MessageUtils.message("log.name1"),

36
ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java
View File

@ -96,8 +96,20 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
log.warn("检测到设备离线状态未更新 设备[{}]离线已更新", equipmentCode);
continue;
}
record.setStatus(telemetryMsg.getOpenPercentage());
record.setFaultStatus(telemetryMsg.getGarageException());
int status = 0;
Integer garageException = telemetryMsg.getGarageException();
if (garageException ==11||garageException ==12||garageException ==13||garageException ==14){
status = garageException;
}else{//10 无故障
if (telemetryMsg.getWorkState()==0){
// status = telemetryMsg.getOpenPercentage();
status = telemetryMsg.getWorkState();
}else {
status = telemetryMsg.getWorkState();
}
}
record.setStatus(status);
record.setFaultStatus(garageException);
record.setPartOpenSwitch(telemetryMsg.getPartOpenSwitch());
//开合状态
@ -108,8 +120,14 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
:MessageUtils.message("openStatus.name1")+ telemetryMsg.getOpenPercentage()+"%");
//运行状态
record.setRunStatus(telemetryMsg.getGarageException()==10?telemetryMsg.getWorkState():telemetryMsg.getGarageException());
record.setRunStatusText(MessageUtils.message("runStatus.name"+record.getRunStatus()));
record.setRunStatus(garageException ==10?telemetryMsg.getWorkState(): garageException);
String runStatusText = "";
if (status == 0){
runStatusText = record.getOpenStatusText();
}else {
runStatusText = MessageUtils.message("runStatus.name"+record.getRunStatus());
}
record.setRunStatusText(runStatusText);
}else{
// 离线不需要调用接口 也不更新状态 在线离线状态要在事件触发的时候更新 否则性能很差
}
@ -307,7 +325,15 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
//运行状态
result.setRunStatus(telemetryMsg.getGarageException()==10?telemetryMsg.getWorkState():telemetryMsg.getGarageException());
result.setRunStatusText(MessageUtils.message("runStatus.name"+result.getRunStatus()));
Integer runStatus = result.getRunStatus();
String runStatusText = "";
if (runStatus == 0){
runStatusText = result.getOpenStatusText();
}else {
runStatusText = MessageUtils.message("runStatus.name"+result.getRunStatus());
}
result.setRunStatusText(runStatusText);
// result.setRunStatusText(MessageUtils.message("runStatus.name"+ runStatus));
result.setEquipmentName(eqEquipmentVo.getEquipmentName());
result.setBindTime(eqEquipmentVo.getBindTime());

8
ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -61,8 +61,8 @@ tenant.blocked=对不起，您的租户已禁用，请联系管理员
tenant.expired=对不起，您的租户已过期，请联系管理员
## 《开合状态》
openStatus.name0=已关闭
openStatus.name1=打开
openStatus.name0=关闭
openStatus.name1=开启
## 《运行状态》
runStatus.name0=停止中
runStatus.name1=关闭中
@ -75,8 +75,8 @@ runStatus.name14=设备故障
## 日志状态
## 《运行状态》
logStatus.name0=停止中
logStatus.name1=关闭中
logStatus.name2=开启中
logStatus.name1=APP远程关门
logStatus.name2=APP远程开门
## 《故障状态》
logStatus.name10=无异常
logStatus.name11=红外故障