代码修改

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

@@ -243,7 +243,13 @@ public class EqDeviceController extends BaseController {
                 //zc 字典中数据多语言按照录入
             }
         }).toList();
-        return rowsData.stream().collect(Collectors.groupingBy(EqEquipmentLogVo::getCreatedYearDay));
+        return rowsData.stream()
+            .collect(Collectors.groupingBy(
+                EqEquipmentLogVo::getCreatedYearDay,
+                () -> new TreeMap<>(Comparator.reverseOrder()), // 提供一个倒序的TreeMap
+                Collectors.toList() // 将每个key对应的元素收集到列表中
+            ));
+//        return rowsData.stream().collect(Collectors.groupingBy(EqEquipmentLogVo::getCreatedYearDay));
     }
 
     /**

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

@@ -619,6 +619,15 @@ public class EqTextController extends BaseController {
             MessageUtils.message("email.name3")
         ));
 
+        //checkCodeStatusStr
+        result.put("checkCodeStatusStr",Arrays.asList(
+            MessageUtils.message("checkCodeStatusStr.name1"),
+            MessageUtils.message("checkCodeStatusStr.name2"),
+            MessageUtils.message("checkCodeStatusStr.name3"),
+            MessageUtils.message("checkCodeStatusStr.name4"),
+            MessageUtils.message("checkCodeStatusStr.name5")
+        ));
+
         return R.ok(result);
     }
 

ruoyi-admin/src/main/java/org/dromara/web/device/DeviceCtlCmd.java

@@ -38,8 +38,12 @@ public class DeviceCtlCmd {
     //照明灯开关	URC+ECTPS=GarageDoorLightControl,LightSwitch,0,true,{},98
     public static final String LightSwitch_true = "URC+ECTPS=GarageDoorLightControl,LightSwitch,0,true,{},98\r\n";
 
+    //遥控器对码
     public static final String RFControllorPair = "URC+ECTAS=GarageDoor,RFControllorPair,{},{},\r\n";
+    //擦除已匹配的遥控器
     public static final String RFControllorErase = "URC+ECTAS=GarageDoor,RFControllorErase,{},{},\r\n";
+    //遥控器退出对码
+    public static final String RFControllorExit = "URC+ECTAS=GarageDoor,RFControllorExit,{},{},\r\n";
     public static final String wifiDefault = "wifiDefault\r\n";//wifi默认值 随意填写
 
 }

ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceMsgDto.java

@@ -194,6 +194,7 @@ public class DeviceMsgDto {
      * 2.遥控器对码完成
      * 3.遥控器擦除中
      * 4.遥控器擦除完成
+     * 5.遥控器对码失败
      */
     private Integer checkCodeStatus;
 
@@ -202,11 +203,13 @@ public class DeviceMsgDto {
      * 2.遥控器对码完成
      * 3.遥控器擦除中
      * 4.遥控器擦除完成
+     * 5.遥控器对码失败
      */
     private String checkCodeStatusStr;
     /**
      * 已配对遥控器数量
      */
     private Integer rfcNumber;
+
 }
 

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

@@ -41,6 +41,7 @@ public class EqDeviceCmdBo implements Serializable {
      * 8.关灯
      * 9对码
      * 10.清码
+     * 11.遥控器退出对码
      * 20.支持单独修改wifi
      */
     private int operateType;

ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java

@@ -111,6 +111,9 @@ public class IotService {
         result.setCheckCodeStatus(Integer.valueOf(resultMap.get("checkCodeStatus")==null?"-1":resultMap.get("checkCodeStatus")));
         result.setCheckCodeStatusStr(MessageUtils.message("checkCodeStatusStr.name"+result.getCheckCodeStatus()));
         result.setRfcNumber(Integer.valueOf(resultMap.get("RFControllorNumber")==null?"-1":resultMap.get("RFControllorNumber")));
+//        String duiMa = resultMap.get("RFControllor");
+//        int duiMaStatus = "paired".equals(duiMa)?1:"failed".equals(duiMa)?2:"erasing".equals(duiMa)?3:"erased".equals(duiMa)?4:"pairing".equals(duiMa)?0:-1;
+//        result.setDuiMaStatus(duiMaStatus);//对码状态
         return result;
     }
 

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

@@ -235,6 +235,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
             case 8: cmd = DeviceCtlCmd.LightSwitch_false; break;//照明灯开关 关
             case 9: cmd = DeviceCtlCmd.RFControllorPair; break;//对码
             case 10: cmd = DeviceCtlCmd.RFControllorErase; break;//清码
+            case 11: cmd = DeviceCtlCmd.RFControllorExit; break;//遥控器退出对码
             case 20: cmd = DeviceCtlCmd.wifiDefault; break;//wifi单独修改
             default:
                 return "指令类型错误";