mirror of
https://gitee.com/dromara/RuoYi-Vue-Plus.git
synced 2026-09-18 17:38:48 +08:00
文本输出及接口优化
This commit is contained in:
zhangzhicheng
parent
f12fefc7f5
commit
9a65ffea6c
@ -90,7 +90,8 @@ public class EqTextController extends BaseController {
|
||||
result.put("warningClose",Arrays.asList(
|
||||
MessageUtils.message("warningClose.name0"),
|
||||
MessageUtils.message("warningClose.name1"),
|
||||
MessageUtils.message("warningClose.name2")
|
||||
MessageUtils.message("warningClose.name2"),
|
||||
MessageUtils.message("warningClose.name3")
|
||||
));
|
||||
result.put("add",Arrays.asList(
|
||||
MessageUtils.message("add.name0"),
|
||||
@ -251,6 +252,14 @@ public class EqTextController extends BaseController {
|
||||
MessageUtils.message("setRebound.name3")
|
||||
));
|
||||
|
||||
result.put("setDelete",Arrays.asList(
|
||||
MessageUtils.message("setDelete.name0"),
|
||||
MessageUtils.message("setDelete.name1"),
|
||||
MessageUtils.message("setDelete.name2"),
|
||||
MessageUtils.message("setDelete.name3"),
|
||||
MessageUtils.message("setDelete.name4")
|
||||
));
|
||||
|
||||
result.put("setZone",Arrays.asList(
|
||||
MessageUtils.message("setZone.name0"),
|
||||
MessageUtils.message("setZone.name1")
|
||||
|
||||
@ -1,13 +1,10 @@
|
||||
package org.dromara.web.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
||||
import org.dromara.common.excel.convert.ExcelDictConvert;
|
||||
import org.dromara.web.device.iot.DeviceMsgDto;
|
||||
import org.dromara.web.domain.EqEquipment;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
@ -45,19 +42,65 @@ public class EqEquipmentDetailVo implements Serializable {
|
||||
private String equipmentName;
|
||||
|
||||
/**
|
||||
* 设备状态
|
||||
* 设备状态(开合度)
|
||||
* 0.已关闭
|
||||
* 10.打开10%
|
||||
* 20.打开20%
|
||||
* 30.打开30%
|
||||
* 40.打开40%
|
||||
* 50.打开50%
|
||||
* 60.打开60%
|
||||
* 70.打开70%
|
||||
* 80.打开80%
|
||||
* 90.打开90%
|
||||
* 100.打开100%
|
||||
*/
|
||||
@ExcelProperty(value = "设备状态 设备的打开状态", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "eq_status_type")
|
||||
private Integer status;
|
||||
private Integer openStatus;
|
||||
|
||||
/**
|
||||
* 设备状态
|
||||
* 设备状态(开合度)
|
||||
* 0.已关闭
|
||||
* 10.打开10%
|
||||
* 20.打开20%
|
||||
* 30.打开30%
|
||||
* 40.打开40%
|
||||
* 50.打开50%
|
||||
* 60.打开60%
|
||||
* 70.打开70%
|
||||
* 80.打开80%
|
||||
* 90.打开90%
|
||||
* 100.打开100%
|
||||
*/
|
||||
private Integer openStatusText;
|
||||
|
||||
/**
|
||||
* 设备运行状态
|
||||
* 0.停止中 stop
|
||||
* 1.关闭中 closing
|
||||
* 2.开启中 opening
|
||||
* 11.红外故障 irException
|
||||
* 12.电机运转故障 motorRunException
|
||||
* 13.电机维护故障 motorMaintainException
|
||||
* 14.设备故障 deviceException
|
||||
*/
|
||||
@ExcelProperty(value = "设备状态 设备的打开状态", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "eq_run_status_type")
|
||||
private Integer runStatus;
|
||||
|
||||
/**
|
||||
* 设备运行状态文本
|
||||
* 0.停止中 stop
|
||||
* 1.关闭中 closing
|
||||
* 2.开启中 openning
|
||||
* 11.红外故障 irException
|
||||
* 12.电机运转故障 motorRunException
|
||||
* 13.电机维护故障 motorMaintainException
|
||||
* 14.设备故障 deviceException
|
||||
*/
|
||||
private Integer runStatusText;
|
||||
|
||||
/**
|
||||
* 故障状态
|
||||
*/
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
package org.dromara.web.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
@ -19,7 +18,6 @@ import org.dromara.web.domain.bo.EqAppHomeBo;
|
||||
import org.dromara.web.domain.bo.EqDeviceCmdBo;
|
||||
import org.dromara.web.domain.bo.EqDeviceSetBo;
|
||||
import org.dromara.web.domain.vo.EqEquipmentDetailVo;
|
||||
import org.dromara.web.domain.vo.EqEquipmentStatusVo;
|
||||
import org.dromara.web.service.IotService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.web.domain.bo.EqEquipmentBo;
|
||||
@ -214,7 +212,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
|
||||
result.setLineStatus(serverMsg.getLineStatus()?1:0);
|
||||
//获取遥测数据
|
||||
DeviceMsgDto telemetryMsg = iotService.httpTelemetryGetSend(bo.getEquipmentCode());
|
||||
result.setStatus(telemetryMsg.getOpenPercentage());
|
||||
result.setOpenStatus(telemetryMsg.getOpenPercentage());
|
||||
result.setRunStatus(telemetryMsg.getGarageException()==10?telemetryMsg.getWorkState():telemetryMsg.getGarageException());
|
||||
result.setEquipmentName(eqEquipmentVo.getEquipmentName());
|
||||
result.setBindTime(eqEquipmentVo.getBindTime());
|
||||
|
||||
@ -82,4 +82,177 @@ noinit.name17= Automatic check:
|
||||
noinit.name18= 6. Press the "SET" button again
|
||||
|
||||
|
||||
## "Login"
|
||||
login.name0 = login
|
||||
login.name1= Please enter your account number
|
||||
login.name2= Please enter a password
|
||||
login.name3= I have read and agree to sign
|
||||
login.name4= Immediate registration
|
||||
## "Registration"
|
||||
register.name0 = register
|
||||
register.name1 = register an account
|
||||
register.name2= Please enter your account number
|
||||
register.name3= Please enter your password
|
||||
register.name4= Please enter your password again
|
||||
## "Registration Success"
|
||||
registerSuccess.name0= Registered successfully
|
||||
registerSuccess.name1= your login account
|
||||
registerSuccess.name2= your password
|
||||
registerSuccess.name3= Log in now
|
||||
## "Home Page"
|
||||
homepage.name0= homepage
|
||||
homepage.name1= Status
|
||||
homepage.name2= Closed
|
||||
homepage.name3= Open
|
||||
## "Close Reminder"
|
||||
warningClose.name0= Closing reminder
|
||||
warningClose.name1= deviceName- Open -num- minutes, please remember to close the door
|
||||
warningClose.name2= Close the door
|
||||
warningClose.name3= I see
|
||||
## Add Devices
|
||||
add.name0 = add a device
|
||||
add.name1= Please enter the device code
|
||||
add.name2= Please enter
|
||||
Add. name3= add
|
||||
## Add Success
|
||||
addSuccess.name0= Added successfully
|
||||
addSuccess.name1= Return
|
||||
addSuccess.name2= Continue searching
|
||||
## "Add Failure"
|
||||
addFailure.name0= Add failed
|
||||
addFailure.name1= Correct device number and try again
|
||||
addFailure.name2= Return
|
||||
addFailure.name3= Add again
|
||||
## "Equipment Details"
|
||||
detail.name0= Details
|
||||
## (Closed Open 10% open 100%)
|
||||
detail.name1= Status
|
||||
detail.name2= Closed
|
||||
detail.name3= Open
|
||||
detail.name4= Running status
|
||||
detail.name5= half open
|
||||
detail.name6= off
|
||||
detail.name7= stop
|
||||
detail.name8= open
|
||||
detail.name9= Open the door half way
|
||||
detail.name10= Indicator management
|
||||
detail.name11= Set
|
||||
detail.name12=min Turn off the indicator after the second second
|
||||
detail.name13= Countdown reset
|
||||
detail.name14= Number of runs
|
||||
detail.name15= Number of operations
|
||||
detail.name16= Data log
|
||||
detail.name17= clear code
|
||||
detail.name18= pair code
|
||||
## Countdown Settings
|
||||
countdown.name0= countdown setting
|
||||
countdown.name1= Cancel
|
||||
countdown.name2= Confirm
|
||||
## Data Log
|
||||
log.name0 = Data log
|
||||
log.name1= Select the date
|
||||
log.name2= Today
|
||||
log.name3= Sunday
|
||||
log.name4= Monday
|
||||
log.name5= Tuesday
|
||||
log.name6= Wednesday
|
||||
log.name7= Thursday
|
||||
log.name8= Friday
|
||||
log.name9= Saturday
|
||||
log.name10= Door opening alert
|
||||
## "Code"
|
||||
checkcode.name0= pair code
|
||||
checkcode.name1= Matching code
|
||||
checkcode.name2= Code matching succeeded
|
||||
checkcode.name3= Failed to check the code. Please try again
|
||||
## "Clear Code"
|
||||
clearcode.name0= Prompt
|
||||
clearcode.name1= Please enter the login password
|
||||
clearcode.name2= Please enter the login password to clear the device code
|
||||
clearcode.name3= Cancel
|
||||
clearcode.name4= Confirm
|
||||
clearcode.name5= Password error Please try again
|
||||
|
||||
## "Device Offline Details"
|
||||
offDetail.name0= Details
|
||||
offDetail.name1= The device is offline
|
||||
|
||||
## "Optimization - Settings"
|
||||
set.name0 = set
|
||||
set.name1= Device name
|
||||
set.name2= Device location
|
||||
set.name3= Rebound setting
|
||||
set.name4= infrared sensing
|
||||
set.name5= Open this function, when the motor is closed, if someone or something passes under the door, the infrared sensor will be triggered, and the door will immediately stop closing and open.
|
||||
set.name6= distance limit
|
||||
set.name7= half-open function switch
|
||||
set.name8= half-door height setting
|
||||
set.name9= Reminder close function switch
|
||||
set.name10= Reminder of closing time setting
|
||||
set.name11= Automatic door closing (prompt to start the automatic door opening function, need to open the infrared protection sensor function first)
|
||||
set.name12 = Open this function, when the door is opened to the maximum, the door is not controlled within the set countdown time, then the door will automatically close after the countdown ends.
|
||||
set.name13= Automatic closing time setting
|
||||
set.name14= Number of runs
|
||||
set.name15=WiFi network
|
||||
set.name16= Time zone
|
||||
set.name17= Device model
|
||||
set.name18= serial number
|
||||
set.name19= Module version
|
||||
set.name20=MCU version
|
||||
set.name21= Delete device
|
||||
|
||||
## "Universal"
|
||||
setCommon.detail= details
|
||||
setCommon.add= add
|
||||
setCommon.edit= edit
|
||||
setCommon.delete= delete
|
||||
setCommon.alert= alert
|
||||
setCommon.cancel= cancel
|
||||
setCommon.confirm= Confirm
|
||||
|
||||
## "Change Device Name"
|
||||
setEqname.name0= Changes the device name
|
||||
setEqname.name1= Please enter a name
|
||||
setEqname.name2= Previous page
|
||||
setEqname.name3= Confirm
|
||||
## "Device Location Modification"
|
||||
setEqarea.name0= Changes the device location
|
||||
setEqarea.name1= Previous page
|
||||
setEqarea.name2= Confirm
|
||||
## Rebound Settings
|
||||
setRebound.name0= motor rebound force
|
||||
setRebound.name1= Adjust recoil
|
||||
setRebound.name2= When the motor opens the door, if the opening force exceeds the set range value, the door will immediately stop opening the door;
|
||||
setRebound.name3= If the closing force exceeds the set range value, the door will immediately stop closing and open. This function can adjust the range value of the opening/closing induction force.
|
||||
## "Remove Devices"
|
||||
setDelete.name0= Delete device
|
||||
setDelete.name1= Prompt
|
||||
setDelete.name2= After the device is deleted, it cannot be managed. Exercise caution when performing this operation.
|
||||
setDelete.name3= Cancel
|
||||
setDelete.name4= Confirm deletion
|
||||
## Time Zone Settings
|
||||
setZone.name0= Time zone
|
||||
setZone.name1= Time format
|
||||
## "wifi Network"
|
||||
setWifi.name0=wifi network
|
||||
setWifi.name1= Prompt
|
||||
setWifi.name2= Linked WiFi: XXXXXXXX
|
||||
setWifi.name3= If you need to change your network, make sure you are next to your device
|
||||
setWifi.name4= edge, click the reset WiFi button
|
||||
setWifi.name5 = Confirm deletion
|
||||
setWifi.name6 = Cancel
|
||||
|
||||
## 《开合状态》
|
||||
openStatus.name0=closed
|
||||
openStatus.name1=open
|
||||
## 《运行状态》
|
||||
runStatus.name0=stop
|
||||
runStatus.name1=closing
|
||||
runStatus.name2=opening
|
||||
runStatus.name11=irException
|
||||
runStatus.name12=motorRunException
|
||||
runStatus.name13=motorMaintainException
|
||||
runStatus.name14=deviceException
|
||||
|
||||
|
||||
message.fault.device.notfound = Device not found
|
||||
|
||||
@ -106,7 +106,8 @@ homepage.name3=打开
|
||||
##《关门提醒》
|
||||
warningClose.name0=关门提醒
|
||||
warningClose.name1=设备-deviceName-已开门-num-分钟了，请记得关门
|
||||
warningClose.name2=关门 我知道了
|
||||
warningClose.name2=关门
|
||||
warningClose.name3=我知道了
|
||||
##《添加设备》
|
||||
add.name0=添加设备
|
||||
add.name1=请输入设备编码
|
||||
@ -229,15 +230,28 @@ setDelete.name2=删除设备后，将不能管理设备请谨慎操作！
|
||||
setDelete.name3=取消
|
||||
setDelete.name4=确认删除
|
||||
##《时区设置》
|
||||
setZone.mame0=时区
|
||||
setZone.mame1=时间格式
|
||||
setZone.name0=时区
|
||||
setZone.name1=时间格式
|
||||
##《wifi网络》
|
||||
setWifi.mame0=wifi网络
|
||||
setWifi.mame1=提示
|
||||
setWifi.mame2=已链接WiFi：XXXXXXXX
|
||||
setWifi.mame3=若需更换网络，请确保你在设备旁
|
||||
setWifi.mame4=边后，点击重置WiFi按钮
|
||||
setWifi.mame5=确认删除
|
||||
setWifi.mame6=取消
|
||||
setWifi.name0=wifi网络
|
||||
setWifi.name1=提示
|
||||
setWifi.name2=已链接WiFi：XXXXXXXX
|
||||
setWifi.name3=若需更换网络，请确保你在设备旁
|
||||
setWifi.name4=边后，点击重置WiFi按钮
|
||||
setWifi.name5=确认删除
|
||||
setWifi.name6=取消
|
||||
|
||||
## 《开合状态》
|
||||
openStatus.name0=已关闭
|
||||
openStatus.name1=打开
|
||||
## 《运行状态》
|
||||
runStatus.name0=停止中
|
||||
runStatus.name1=关闭中
|
||||
runStatus.name2=开启中
|
||||
runStatus.name11=红外故障
|
||||
runStatus.name12=电机运转故障
|
||||
runStatus.name13=电机维护故障
|
||||
runStatus.name14=设备故障
|
||||
|
||||
|
||||
message.fault.device.notfound = 设备不存在
|
||||
|
||||
Loading…
Reference in New Issue
Block a user