Api h5接口优化

rouyi-api/src/main/java/com/info666/infraredRemote/controller/GetDeviceInfoController.java

@@ -39,42 +39,28 @@ public class GetDeviceInfoController {
     @ApiOperation("获取遥控设备信息")
     @PostMapping("/getDeviceInfo")
     public R<List<GetDeviceInfoVo>> getDeviceInfo(@RequestBody BaseParam param) {
-        List<GetDeviceInfoVo> list = new ArrayList<>();
-
-//        List<ComponentsLibrary> componentsLibraries = new ArrayList<>();
-
-        List<TemplateLibrary> templaList = templateLibraryService.list(new LambdaQueryWrapper<TemplateLibrary>().eq(TemplateLibrary::getDelFlag, 0));
-        for (TemplateLibrary templateLibrary : templaList) {
+        // TODO: 2023/7/17 跟h5确定后进行变更
+        Long temId = null;
+        if (param.getId() == null) {
+            temId = 1L;
+        }else {
+            temId = param.getId();
+        }
 
-            //获取基本数据
-            BasicLibrary basicLibrary = basicLibraryService.getOne(new LambdaQueryWrapper<BasicLibrary>().eq(BasicLibrary::getDelFlag, 0)
-                    .eq(BasicLibrary::getId, templateLibrary.getId()), false);
-//            ArrayList<Integer> integers = new ArrayList<>();
-            //按照引导次数去写入引导码
-//            for (int i = 0; i < basicLibrary.getBootCodeSend(); i++) {
-//                String[] bootCode = basicLibrary.getBootCode().split(",");
-//                for (String s : bootCode) {
-//                    integers.add(Integer.valueOf(s));
-//                }
-//            }
-//            //数据码
-//            String[] dataCode = basicLibrary.getBootCode().split(",");
-//            for (String s : dataCode) {
-//                integers.add(Integer.valueOf(s));
-//            }
-//            //结束码
-//            for (String s : basicLibrary.getOverCode().split(",")) {
-//                integers.add(Integer.valueOf(s));
-//            }
+        List<GetDeviceInfoVo> list = new ArrayList<>();
+        TemplateLibrary templateLibrary = templateLibraryService.getOne(new LambdaQueryWrapper<TemplateLibrary>().eq(TemplateLibrary::getId, temId), false);
+        //获取基本数据
+        BasicLibrary basicLibrary = basicLibraryService.getOne(new LambdaQueryWrapper<BasicLibrary>().eq(BasicLibrary::getDelFlag, 0)
+                .eq(BasicLibrary::getId, templateLibrary.getBaseId()), false);
+        GetDeviceInfoVo deviceInfoVo = new GetDeviceInfoVo();
+        deviceInfoVo.setBandValue(basicLibrary.getBandValue());
+        deviceInfoVo.setComponentsString(templateLibrary.getComponents());
+        deviceInfoVo.setBasicLibrary(basicLibrary);
+        // TODO: 2023/7/17  需要跟h5再对一下    之前是list 现在只返回一条,不需要list
+        list.add(deviceInfoVo);
 
-            GetDeviceInfoVo  deviceInfoVo = new GetDeviceInfoVo();
-            deviceInfoVo.setBandValue(basicLibrary.getBandValue());
-            deviceInfoVo.setComponentsString(templateLibrary.getComponents());
-//            deviceInfoVo.setComponentsList(componentsLibraries);
-//            deviceInfoVo.setBootCodeLow(integers.toArray(new Integer[0]));
-            deviceInfoVo.setBasicLibrary(basicLibrary);
-            list.add(deviceInfoVo);
-        }
         return R.ok(list);
     }
+
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/GetDeviceInfoVo.java

@@ -1,12 +1,8 @@
 package com.ruoyi.system.domain.vo;
 
-import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.system.domain.BasicLibrary;
-import com.ruoyi.system.domain.ComponentsLibrary;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Author: LiMingMing
  * @Date: 2023/7/13 17:55