diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java index 756d9731..16ba7416 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java +++ b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java @@ -9,7 +9,6 @@ import com.jfinal.aop.Before; import com.jfinal.core.Controller; import com.jfinal.ext.interceptor.GET; import com.jfinal.ext.interceptor.POST; -import com.jfinal.kit.Kv; import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; import io.github.yedaxia.apidocs.ApiDoc; @@ -290,8 +289,8 @@ public class BaseController extends Controller { */ @Before({GET.class}) @JwtCheckInterface({}) - public void getResourceStructureBySchemeId(int scheme_id) { - Record record = bm.getResourceStructureBySchemeId(scheme_id); - renderJson(RetKit.renderSuccess(record)); + public void fetchStructure(int scheme_id) { + List list = bm.fetchStructure(scheme_id, -1); + renderJson(RetKit.renderSuccess("成功", list, null, 1, 99999, list.size())); } } diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java b/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java index f2caf428..70a067b5 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java +++ b/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java @@ -6,6 +6,7 @@ import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; import com.jfinal.plugin.activerecord.SqlPara; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -309,8 +310,18 @@ public class BaseModel { * @param scheme_id 版本号 * @return 结构信息 */ - public Record getResourceStructureBySchemeId(int scheme_id) { - // - return null; + public List fetchStructure(int scheme_id, int parent_id) { + String sql = "select * from t_resource_structure where scheme_id=? and parent_id = ? order by sort_id"; + List list = Db.find(sql, scheme_id, parent_id); + List res = new ArrayList<>(); + + for (Record rs : list) { + int structure_id = rs.getInt("structure_id"); + // 递归查找子菜单 + List childStructure = fetchStructure(scheme_id, structure_id); + rs.set("children", childStructure); + res.add(rs); + } + return res; } }