设备类型维护，表单开发中增加设备类型下拉所需的接口增加、修改

lidee-core/src/main/java/com/lideeyunji/core/framework/adapter/FrameWorkAdapter.java

@@ -338,6 +338,21 @@ public class FrameWorkAdapter implements IlideeYunjiAdapter {
     }
 
 
+    //回显设备类型
+    @TenantIgnore
+    @Override
+    public List<Map<String, Object>> getSblxViewList(List<Long> sblxIdList) {
+        SqlInfoQueryWrapper.Wrapper wrapper = SqlHelper.getQueryWrapper()
+                .select("id", "industry_name AS industryName")
+                .setTableName("dev_sblx")
+                .setWhere(where -> {
+                    where.in("id", sblxIdList);
+                })
+                .build();
+        List<Map<String, Object>> dataList = sqlService.getDataListByPlus(wrapper);
+        return dataList;
+    }
+
     //获取用户分页列表
     @Override
     public Object getUserPage(Integer pageNo, Integer pageSize, lideeYunJiUserParam param) {

lidee-core/src/main/java/com/lideeyunji/core/framework/controller/DbFormController.java

@@ -285,6 +285,10 @@ public class DbFormController extends BaseController {
                             String deptormatSql="(select name from system_dept where id ="+label+") as "+label;
                             fieldList.set(ind,deptormatSql);//子查询
                             break;
+                        case "sblxSelect":
+                            String sblxormatSql="(select industry_name from dev_sblx where id ="+label+") as "+label;
+                            fieldList.set(ind,sblxormatSql);//子查询
+                            break;
                     }
                 }
             }
@@ -306,6 +310,7 @@ public class DbFormController extends BaseController {
                 List<String> dataList = labelParam.getDataList();
                 List<Long> userIdList = labelParam.getUserIdList();//用户id
                 List<Long> deptIdList = labelParam.getDeptIdList();//部门id
+                List<Long> sblxIdList = labelParam.getSblxIdList();//设备类型id
 
                 if (Func.isNotEmpty(dbformId)) { //自定义表
                     String mapKey = dbformId + "&" + label;
@@ -341,6 +346,10 @@ public class DbFormController extends BaseController {
                     List<Map<String, Object>> deptViewList = lideeYunJiAdapter.getDeptViewList(deptIdList);
                     resultMap.put("deptList", deptViewList);
                 }
+                if (Func.isNotEmpty(sblxIdList)) {//部门表回显
+                    List<Map<String, Object>> sblxViewList = lideeYunJiAdapter.getSblxViewList(sblxIdList);
+                    resultMap.put("sblxList", sblxViewList);
+                }
             })).get();
         } catch (InterruptedException | ExecutionException e) {
             throw new RuntimeException(e.getMessage());

lidee-core/src/main/java/com/lideeyunji/core/framework/params/DictLabelParam.java

@@ -33,5 +33,8 @@ public class DictLabelParam {
     @Schema(description = "部门id列表")
     private List<Long> deptIdList;
 
+    @Schema(description = "设备类型id列表")
+    private List<Long> sblxIdList;
+
 
 }