From 4cdbc76b0f80148434700d2f1029b42b40d38fa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 28 Dec 2022 16:58:40 +0800
Subject: [PATCH] 'commit'
---
WebRoot/html/study/TreeManage.html | 4 ++--
WebRoot/html/study/add.html | 15 ++++++++++++++-
WebRoot/html/study/update.html | 14 ++++++++++++++
.../FengHuang/Zjb/Controller/ZjbController.java | 9 +++++----
.../com/dsideal/FengHuang/Zjb/Model/ZjbModel.java | 8 +++++---
5 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/WebRoot/html/study/TreeManage.html b/WebRoot/html/study/TreeManage.html
index 74f5709..bd87585 100644
--- a/WebRoot/html/study/TreeManage.html
+++ b/WebRoot/html/study/TreeManage.html
@@ -80,7 +80,7 @@
let btn = $("#addBtn_" + treeNode.tId);
if (btn)
btn.bind("click", function () {
- WeAdminShow('增加', 'add.html?parent_id=' + treeNode.id + "&level_id=" + treeNode.level_id, 550, 200);
+ WeAdminShow('增加', 'add.html?parent_id=' + treeNode.id + "&level_id=" + treeNode.level_id, 550, 300);
})
}
@@ -122,7 +122,7 @@
}
// 编辑
function beforeEditName(treeId, treeNode) {
- WeAdminShow('编辑', 'update.html?id=' + treeNode.id, 550, 200);
+ WeAdminShow('编辑', 'update.html?id=' + treeNode.id, 550, 300);
}
window.loadTree = function () {
diff --git a/WebRoot/html/study/add.html b/WebRoot/html/study/add.html
index d664895..98ed40f 100644
--- a/WebRoot/html/study/add.html
+++ b/WebRoot/html/study/add.html
@@ -38,6 +38,16 @@
+
+
@@ -65,6 +75,8 @@
//监听提交
form.on('submit(add)', function (data) {
let name = $("#name").val();
+ let sort_id=$("#sort_id").val();
+
$.ajax({
type: "POST",
async: false,
@@ -73,7 +85,8 @@
data: {
name: name,
parent_id: parent_id,
- level_id: level_id
+ level_id: level_id,
+ sort_id:sort_id
},
success: function (data) {
if (data.success) {
diff --git a/WebRoot/html/study/update.html b/WebRoot/html/study/update.html
index acfba77..4e84fdf 100644
--- a/WebRoot/html/study/update.html
+++ b/WebRoot/html/study/update.html
@@ -38,6 +38,16 @@
+
+
@@ -68,8 +78,10 @@
dataType: "json",
url: "/FengHuang/zjb/getTreeNode?id=" + id,
success: function (data) {
+ console.log(data);
if (data.success) {
$("#name").val(data.name);
+ $("#sort_id").val(data.sort_id);
} else {
layer.alert(data.message, {icon: 0})
}
@@ -79,6 +91,7 @@
//监听提交
form.on('submit(add)', function (data) {
let name = $("#name").val();
+ let sort_id = $("#sort_id").val();
$.ajax({
type: "POST",
async: false,
@@ -87,6 +100,7 @@
data: {
name: name,
id: id,
+ sort_id: sort_id
},
success: function (data) {
if (data.success) {
diff --git a/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java b/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java
index 7e50aca..8f989c9 100644
--- a/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java
+++ b/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java
@@ -113,8 +113,8 @@ public class ZjbController extends Controller {
}
@Before({POST.class})
- public void saveTreeNode(int level_id, int parent_id, String name) {
- zm.saveTreeNode(level_id, parent_id, name);
+ public void saveTreeNode(int level_id, int parent_id, String name, int sort_id) {
+ zm.saveTreeNode(level_id, parent_id, name, sort_id);
renderJson(CommonUtil.returnMessageJson(true, "保存成功！"));
}
@@ -125,8 +125,8 @@ public class ZjbController extends Controller {
}
@Before({POST.class})
- public void updateTreeNode(int id, String name) {
- zm.updateTreeNode(id, name);
+ public void updateTreeNode(int id, String name,int sort_id) {
+ zm.updateTreeNode(id, name,sort_id);
renderJson(CommonUtil.returnMessageJson(true, "保存成功！"));
}
@@ -136,6 +136,7 @@ public class ZjbController extends Controller {
Kv kv = Kv.create();
kv.set("success", true);
kv.set("name", record.getStr("name"));
+ kv.set("sort_id", record.getInt("sort_id"));
renderJson(kv);
}
}
\ No newline at end of file
diff --git a/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java b/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java
index 683543e..d5f417e 100644
--- a/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java
+++ b/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java
@@ -177,7 +177,7 @@ public class ZjbModel {
}
public List getTreeData() {
- String sql = "select t1.id,t1.name,t1.parent_id as pId,t1.level_id,true as open,(select count(1) from t_zjb_tree as t2 where t1.id=t2.parent_id) as childCount from t_zjb_tree as t1";
+ String sql = "select t1.id,t1.name,t1.parent_id as pId,t1.sort_id,t1.level_id,true as open,(select count(1) from t_zjb_tree as t2 where t1.id=t2.parent_id) as childCount from t_zjb_tree as t1 order by sort_id";
return Db.find(sql);
}
@@ -185,17 +185,19 @@ public class ZjbModel {
Db.deleteById("t_zjb_tree", "id", id);
}
- public void saveTreeNode(int level_id, int parent_id, String name) {
+ public void saveTreeNode(int level_id, int parent_id, String name,int sort_id) {
Record record = new Record();
record.set("name", name);
record.set("level_id", level_id + 1);
record.set("parent_id", parent_id);
+ record.set("sort_id",sort_id);
Db.save("t_zjb_tree", "id", record);
}
- public void updateTreeNode(int id, String name) {
+ public void updateTreeNode(int id, String name,int sort_id) {
Record record = getTreeNode(id);
record.set("name", name);
+ record.set("sort_id",sort_id);
Db.update("t_zjb_tree", "id", record);
}