代码优化

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

@@ -101,7 +101,7 @@ public class EqDeviceController extends BaseController {
      * 获取日志
      * @param bo
      * @param pageQuery
-     * @return
+     * @return todo
      */
     @GetMapping("/getDeviceLogs")
     public TableDataInfo<EqEquipmentLogVo> getDeviceLogs(EqAppHomeBo bo,PageQuery pageQuery){

ruoyi-admin/src/main/java/org/dromara/web/domain/EqUserConfig.java

@@ -35,17 +35,17 @@ public class EqUserConfig extends BaseEntity {
     /**
      * 时区类型
      */
-    private Integer timezoneType;
+    private String timezoneType;
 
     /**
      * 时间格式
      */
-    private Integer timeFormat;
+    private String timeFormat;
 
     /**
      * 语言种类
      */
-    private Integer languageType;
+    private String languageType;
 
 
 }

ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentLogBo.java

@@ -76,6 +76,10 @@ public class EqEquipmentLogBo extends BaseEntity {
     @NotNull(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private Integer status;
 
+    private String logStatus;
+
+    //todo 返回状态文本
+
     /**
      * 故障状态
      * 10.无异常 none

ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqUserConfigBo.java

@@ -36,19 +36,19 @@ public class EqUserConfigBo extends BaseEntity {
      * 时区类型
      */
     @NotNull(message = "时区类型不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer timezoneType;
+    private String timezoneType;
 
     /**
      * 时间格式
      */
     @NotNull(message = "时间格式不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer timeFormat;
+    private String timeFormat;
 
     /**
      * 语言种类
      */
     @NotNull(message = "语言种类不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer languageType;
+    private String languageType;
 
 
 }

ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentDetailVo.java

@@ -72,6 +72,7 @@ public class EqEquipmentDetailVo implements Serializable {
      * 80.打开80%
      * 90.打开90%
      * 100.打开100%
+     * 故障状态
      */
     private String openStatusText;
 

ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqUserConfigVo.java

@@ -45,21 +45,21 @@ public class EqUserConfigVo implements Serializable {
      */
     @ExcelProperty(value = "时区类型", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "eq_timezone_type")
-    private Integer timezoneType;
+    private String timezoneType;
 
     /**
      * 时间格式
      */
     @ExcelProperty(value = "时间格式", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "eq_time_format_type")
-    private Integer timeFormat;
+    private String timeFormat;
 
     /**
      * 语言种类
      */
     @ExcelProperty(value = "语言种类", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "eq_language_type")
-    private Integer languageType;
+    private String languageType;
 
 
 }

ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -257,5 +257,31 @@ runStatus.name12=电机运转故障
 runStatus.name13=电机维护故障
 runStatus.name14=设备故障
 
+## 日志状态
+## 《运行状态》
+logStatus.name0=停止中
+logStatus.name1=关闭中
+logStatus.name2=开启中
+## 《故障状态》
+logStatus.name10=无异常
+logStatus.name11=红外故障
+logStatus.name12=电机运转故障
+logStatus.name13=电机维护故障
+logStatus.name14=设备故障
+## 《故障状态》
+logStatus.name101=烟雾报警
+logStatus.name102=红外触发报警
+logStatus.name103=电机运行报警
+logStatus.name104=电机维修报警
+logStatus.name105=非APP开门提醒
+logStatus.name106=非APP关门提醒
+logStatus.name107=关门故障报警
+logStatus.name108=开门故障报警
+logStatus.name109=开门运行提醒
+logStatus.name110=关门运行提醒
+logStatus.name111=忘记关门提醒
+logStatus.name112=门体手动开启提醒
+logStatus.name113=半开门运行提醒
+logStatus.name114=门体停止运行提醒
 
 message.fault.device.notfound = 设备不存在