From b0c83559863f5ad2bbc9ebf1ba8d8812ea40da2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 15 Oct 2024 13:55:12 +0800
Subject: [PATCH] 'commit'
---
dsRes/Doc/v1.0/.cache.json | 2 +-
...source_Base_Controller_BaseController.html | 14 +-
dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json | 280 ++++++++++++++++++
dsRes/Doc/v1.0/index.html | 4 +-
.../Base/Controller/BaseController.java | 66 +++++
.../resource/Base/Model/BaseModel.java | 64 ++++
.../dsideal/resource/JApiDocsGenerator.java | 2 +-
.../Code/t_resource_structure_Controller.txt | 66 +++++
.../Code/t_resource_structure_Model.txt | 65 ++++
.../Code/t_wx_fault_type_Controller.txt | 58 ----
.../dsideal/Code/t_wx_fault_type_Model.txt | 53 ----
dsUtils/src/main/resources/Controller.ftl | 8 +-
.../src/main/resources/application.properties | 4 +-
dsUtils/target/classes/Controller.ftl | 8 +-
dsUtils/target/classes/application.properties | 4 +-
15 files changed, 558 insertions(+), 140 deletions(-)
create mode 100644 dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json
create mode 100644 dsUtils/src/main/java/com/dsideal/Code/t_resource_structure_Controller.txt
create mode 100644 dsUtils/src/main/java/com/dsideal/Code/t_resource_structure_Model.txt
delete mode 100644 dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type_Controller.txt
delete mode 100644 dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type_Model.txt
diff --git a/dsRes/Doc/v1.0/.cache.json b/dsRes/Doc/v1.0/.cache.json
index 3c66ba24..b505f545 100644
--- a/dsRes/Doc/v1.0/.cache.json
+++ b/dsRes/Doc/v1.0/.cache.json
@@ -1 +1 @@
-[{"baseUrl":"","className":"BaseController","description":"BaseController","docFileName":"com_dsideal_resource_Base_Controller_BaseController.html","generateDocs":true,"packageName":"com.dsideal.resource.Base.Controller","requestNodes":[{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#getStageList","deprecated":false,"description":"获取学段列表","header":[],"method":["GET","POST"],"methodName":"getStageList","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/getStageList"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#addSubject","deprecated":false,"description":"增加科目","header":[],"method":["GET","POST"],"methodName":"addSubject","paramNodes":[{"description":"科目名称","jsonBody":false,"name":"subject_name","required":false,"type":"string"},{"description":"科目代码","jsonBody":false,"name":"subject_code","required":false,"type":"string"},{"description":"学段ID","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"排序号","jsonBody":false,"name":"sort_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/addSubject"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#delSubject","deprecated":false,"description":"删除科目","header":[],"method":["GET","POST"],"methodName":"delSubject","paramNodes":[{"description":"科目ID","jsonBody":false,"name":"subject_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/delSubject"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#updateSubject","deprecated":false,"description":"修改科目","header":[],"method":["GET","POST"],"methodName":"updateSubject","paramNodes":[{"description":"科目ID","jsonBody":false,"name":"subject_id","required":false,"type":"int"},{"description":"科目名称","jsonBody":false,"name":"subject_name","required":false,"type":"string"},{"description":"科目代码","jsonBody":false,"name":"subject_code","required":false,"type":"string"},{"description":"学段ID","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"排序号","jsonBody":false,"name":"sort_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/updateSubject"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#listSubject","deprecated":false,"description":"科目列表","header":[],"method":["GET","POST"],"methodName":"listSubject","paramNodes":[{"description":"学段id","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"页码","jsonBody":false,"name":"pageNum","required":false,"type":"int"},{"description":"每页大小","jsonBody":false,"name":"pageSize","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/listSubject"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#getSubject","deprecated":false,"description":"获取科目详情","header":[],"method":["GET","POST"],"methodName":"getSubject","paramNodes":[{"description":"科目ID","jsonBody":false,"name":"subject_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/getSubject"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#addScheme","deprecated":false,"description":"增加版本","header":[],"method":["GET","POST"],"methodName":"addScheme","paramNodes":[{"description":"版本名称","jsonBody":false,"name":"scheme_name","required":false,"type":"string"},{"description":"学段ID","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"科目ID","jsonBody":false,"name":"subject_id","required":false,"type":"int"},{"description":"创建人ID","jsonBody":false,"name":"owner_id","required":false,"type":"string"},{"description":"1:章节目录结构 2:知识点结构","jsonBody":false,"name":"type_id","required":false,"type":"int"},{"description":"1:系统 2云盘","jsonBody":false,"name":"scheme_type_id","required":false,"type":"int"},{"description":"排序号","jsonBody":false,"name":"sort_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/addScheme"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#delScheme","deprecated":false,"description":"删除版本","header":[],"method":["GET","POST"],"methodName":"delScheme","paramNodes":[{"description":"版本ID","jsonBody":false,"name":"scheme_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/delScheme"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#updateScheme","deprecated":false,"description":"修改版本","header":[],"method":["GET","POST"],"methodName":"updateScheme","paramNodes":[{"description":"版本ID","jsonBody":false,"name":"scheme_id","required":false,"type":"int"},{"description":"版本名称","jsonBody":false,"name":"scheme_name","required":false,"type":"string"},{"description":"学段ID","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"科目ID","jsonBody":false,"name":"subject_id","required":false,"type":"int"},{"description":"1:章节目录结构 2:知识点结构","jsonBody":false,"name":"type_id","required":false,"type":"int"},{"description":"1:系统 2云盘","jsonBody":false,"name":"scheme_type_id","required":false,"type":"int"},{"description":"排序号","jsonBody":false,"name":"sort_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/updateScheme"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#listScheme","deprecated":false,"description":"版本列表","header":[],"method":["GET","POST"],"methodName":"listScheme","paramNodes":[{"description":"学段ID","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"页码","jsonBody":false,"name":"pageNum","required":false,"type":"int"},{"description":"每页大小","jsonBody":false,"name":"pageSize","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/listScheme"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#getScheme","deprecated":false,"description":"获取版本信息","header":[],"method":["GET","POST"],"methodName":"getScheme","paramNodes":[{"description":"版本ID","jsonBody":false,"name":"scheme_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/getScheme"}],"srcFileName":"D:\\dsWork\\dsProject\\dsRes\\src\\main\\java\\com\\dsideal\\resource\\Base\\Controller\\BaseController.java"}]
\ No newline at end of file
+[{"baseUrl":"","className":"BaseController","description":"BaseController","docFileName":"com_dsideal_resource_Base_Controller_BaseController.html","generateDocs":true,"packageName":"com.dsideal.resource.Base.Controller","requestNodes":[{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#getStageList","deprecated":false,"description":"获取学段列表","header":[],"method":["GET","POST"],"methodName":"getStageList","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/getStageList"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#addSubject","deprecated":false,"description":"增加科目","header":[],"method":["GET","POST"],"methodName":"addSubject","paramNodes":[{"description":"科目名称","jsonBody":false,"name":"subject_name","required":false,"type":"string"},{"description":"科目代码","jsonBody":false,"name":"subject_code","required":false,"type":"string"},{"description":"学段ID","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"排序号","jsonBody":false,"name":"sort_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/addSubject"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#delSubject","deprecated":false,"description":"删除科目","header":[],"method":["GET","POST"],"methodName":"delSubject","paramNodes":[{"description":"科目ID","jsonBody":false,"name":"subject_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/delSubject"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#updateSubject","deprecated":false,"description":"修改科目","header":[],"method":["GET","POST"],"methodName":"updateSubject","paramNodes":[{"description":"科目ID","jsonBody":false,"name":"subject_id","required":false,"type":"int"},{"description":"科目名称","jsonBody":false,"name":"subject_name","required":false,"type":"string"},{"description":"科目代码","jsonBody":false,"name":"subject_code","required":false,"type":"string"},{"description":"学段ID","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"排序号","jsonBody":false,"name":"sort_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/updateSubject"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#listSubject","deprecated":false,"description":"科目列表","header":[],"method":["GET","POST"],"methodName":"listSubject","paramNodes":[{"description":"学段id","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"页码","jsonBody":false,"name":"pageNum","required":false,"type":"int"},{"description":"每页大小","jsonBody":false,"name":"pageSize","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/listSubject"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#getSubject","deprecated":false,"description":"获取科目详情","header":[],"method":["GET","POST"],"methodName":"getSubject","paramNodes":[{"description":"科目ID","jsonBody":false,"name":"subject_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/getSubject"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#addScheme","deprecated":false,"description":"增加版本","header":[],"method":["GET","POST"],"methodName":"addScheme","paramNodes":[{"description":"版本名称","jsonBody":false,"name":"scheme_name","required":false,"type":"string"},{"description":"学段ID","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"科目ID","jsonBody":false,"name":"subject_id","required":false,"type":"int"},{"description":"创建人ID","jsonBody":false,"name":"owner_id","required":false,"type":"string"},{"description":"1:章节目录结构 2:知识点结构","jsonBody":false,"name":"type_id","required":false,"type":"int"},{"description":"排序号","jsonBody":false,"name":"sort_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/addScheme"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#delScheme","deprecated":false,"description":"删除版本","header":[],"method":["GET","POST"],"methodName":"delScheme","paramNodes":[{"description":"版本ID","jsonBody":false,"name":"scheme_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/delScheme"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#updateScheme","deprecated":false,"description":"修改版本","header":[],"method":["GET","POST"],"methodName":"updateScheme","paramNodes":[{"description":"版本ID","jsonBody":false,"name":"scheme_id","required":false,"type":"int"},{"description":"版本名称","jsonBody":false,"name":"scheme_name","required":false,"type":"string"},{"description":"学段ID","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"科目ID","jsonBody":false,"name":"subject_id","required":false,"type":"int"},{"description":"1:章节目录结构 2:知识点结构","jsonBody":false,"name":"type_id","required":false,"type":"int"},{"description":"排序号","jsonBody":false,"name":"sort_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/updateScheme"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#listScheme","deprecated":false,"description":"版本列表","header":[],"method":["GET","POST"],"methodName":"listScheme","paramNodes":[{"description":"学段ID","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"页码","jsonBody":false,"name":"pageNum","required":false,"type":"int"},{"description":"每页大小","jsonBody":false,"name":"pageSize","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/listScheme"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#getScheme","deprecated":false,"description":"获取版本信息","header":[],"method":["GET","POST"],"methodName":"getScheme","paramNodes":[{"description":"版本ID","jsonBody":false,"name":"scheme_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/getScheme"}],"srcFileName":"D:\\dsWork\\dsProject\\dsRes\\src\\main\\java\\com\\dsideal\\resource\\Base\\Controller\\BaseController.java"}]
\ No newline at end of file
diff --git a/dsRes/Doc/v1.0/com_dsideal_resource_Base_Controller_BaseController.html b/dsRes/Doc/v1.0/com_dsideal_resource_Base_Controller_BaseController.html
index 0d541546..1b00dd78 100644
--- a/dsRes/Doc/v1.0/com_dsideal_resource_Base_Controller_BaseController.html
+++ b/dsRes/Doc/v1.0/com_dsideal_resource_Base_Controller_BaseController.html
@@ -14,7 +14,7 @@
@@ -336,12 +336,6 @@
否 |
1:章节目录结构 2:知识点结构 |
-
- scheme_type_id |
- int |
- 否 |
- 1:系统 2云盘 |
-
sort_id |
int |
@@ -426,12 +420,6 @@
否 |
1:章节目录结构 2:知识点结构 |
-
- scheme_type_id |
- int |
- 否 |
- 1:系统 2云盘 |
-
sort_id |
int |
diff --git a/dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json b/dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json
new file mode 100644
index 00000000..8d5d4623
--- /dev/null
+++ b/dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json
@@ -0,0 +1,280 @@
+{
+ "item": [
+ {
+ "request": {
+ "method": "GET",
+ "url": {
+ "query": [],
+ "raw": "{{domain}}/base/getStageList"
+ }
+ },
+ "name": "获取学段列表"
+ },
+ {
+ "request": {
+ "method": "POST",
+ "url": {
+ "query": [
+ {
+ "description": "科目名称",
+ "value": "",
+ "key": "subject_name"
+ },
+ {
+ "description": "科目代码",
+ "value": "",
+ "key": "subject_code"
+ },
+ {
+ "description": "学段ID",
+ "value": "",
+ "key": "stage_id"
+ },
+ {
+ "description": "排序号",
+ "value": "",
+ "key": "sort_id"
+ }
+ ],
+ "raw": "{{domain}}/base/addSubject"
+ }
+ },
+ "name": "增加科目"
+ },
+ {
+ "request": {
+ "method": "POST",
+ "url": {
+ "query": [
+ {
+ "description": "科目ID",
+ "value": "",
+ "key": "subject_id"
+ }
+ ],
+ "raw": "{{domain}}/base/delSubject"
+ }
+ },
+ "name": "删除科目"
+ },
+ {
+ "request": {
+ "method": "POST",
+ "url": {
+ "query": [
+ {
+ "description": "科目ID",
+ "value": "",
+ "key": "subject_id"
+ },
+ {
+ "description": "科目名称",
+ "value": "",
+ "key": "subject_name"
+ },
+ {
+ "description": "科目代码",
+ "value": "",
+ "key": "subject_code"
+ },
+ {
+ "description": "学段ID",
+ "value": "",
+ "key": "stage_id"
+ },
+ {
+ "description": "排序号",
+ "value": "",
+ "key": "sort_id"
+ }
+ ],
+ "raw": "{{domain}}/base/updateSubject"
+ }
+ },
+ "name": "修改科目"
+ },
+ {
+ "request": {
+ "method": "GET",
+ "url": {
+ "query": [
+ {
+ "description": "学段id",
+ "value": "",
+ "key": "stage_id"
+ },
+ {
+ "description": "页码",
+ "value": "",
+ "key": "pageNum"
+ },
+ {
+ "description": "每页大小",
+ "value": "",
+ "key": "pageSize"
+ }
+ ],
+ "raw": "{{domain}}/base/listSubject"
+ }
+ },
+ "name": "科目列表"
+ },
+ {
+ "request": {
+ "method": "GET",
+ "url": {
+ "query": [
+ {
+ "description": "科目ID",
+ "value": "",
+ "key": "subject_id"
+ }
+ ],
+ "raw": "{{domain}}/base/getSubject"
+ }
+ },
+ "name": "获取科目详情"
+ },
+ {
+ "request": {
+ "method": "POST",
+ "url": {
+ "query": [
+ {
+ "description": "版本名称",
+ "value": "",
+ "key": "scheme_name"
+ },
+ {
+ "description": "学段ID",
+ "value": "",
+ "key": "stage_id"
+ },
+ {
+ "description": "科目ID",
+ "value": "",
+ "key": "subject_id"
+ },
+ {
+ "description": "创建人ID",
+ "value": "",
+ "key": "owner_id"
+ },
+ {
+ "description": "1:章节目录结构 2:知识点结构",
+ "value": "",
+ "key": "type_id"
+ },
+ {
+ "description": "排序号",
+ "value": "",
+ "key": "sort_id"
+ }
+ ],
+ "raw": "{{domain}}/base/addScheme"
+ }
+ },
+ "name": "增加版本"
+ },
+ {
+ "request": {
+ "method": "POST",
+ "url": {
+ "query": [
+ {
+ "description": "版本ID",
+ "value": "",
+ "key": "scheme_id"
+ }
+ ],
+ "raw": "{{domain}}/base/delScheme"
+ }
+ },
+ "name": "删除版本"
+ },
+ {
+ "request": {
+ "method": "POST",
+ "url": {
+ "query": [
+ {
+ "description": "版本ID",
+ "value": "",
+ "key": "scheme_id"
+ },
+ {
+ "description": "版本名称",
+ "value": "",
+ "key": "scheme_name"
+ },
+ {
+ "description": "学段ID",
+ "value": "",
+ "key": "stage_id"
+ },
+ {
+ "description": "科目ID",
+ "value": "",
+ "key": "subject_id"
+ },
+ {
+ "description": "1:章节目录结构 2:知识点结构",
+ "value": "",
+ "key": "type_id"
+ },
+ {
+ "description": "排序号",
+ "value": "",
+ "key": "sort_id"
+ }
+ ],
+ "raw": "{{domain}}/base/updateScheme"
+ }
+ },
+ "name": "修改版本"
+ },
+ {
+ "request": {
+ "method": "GET",
+ "url": {
+ "query": [
+ {
+ "description": "学段ID",
+ "value": "",
+ "key": "stage_id"
+ },
+ {
+ "description": "页码",
+ "value": "",
+ "key": "pageNum"
+ },
+ {
+ "description": "每页大小",
+ "value": "",
+ "key": "pageSize"
+ }
+ ],
+ "raw": "{{domain}}/base/listScheme"
+ }
+ },
+ "name": "版本列表"
+ },
+ {
+ "request": {
+ "method": "GET",
+ "url": {
+ "query": [
+ {
+ "description": "版本ID",
+ "value": "",
+ "key": "scheme_id"
+ }
+ ],
+ "raw": "{{domain}}/base/getScheme"
+ }
+ },
+ "name": "获取版本信息"
+ }
+ ],
+ "name": "BaseController"
+}
\ No newline at end of file
diff --git a/dsRes/Doc/v1.0/index.html b/dsRes/Doc/v1.0/index.html
index ab6a4291..325cdece 100644
--- a/dsRes/Doc/v1.0/index.html
+++ b/dsRes/Doc/v1.0/index.html
@@ -3,7 +3,7 @@
- dsProjectAPI Documentation
+ dsResAPI Documentation
@@ -14,7 +14,7 @@
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 b3e3c898..70204302 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
@@ -222,4 +222,70 @@ public class BaseController extends Controller {
Record record = bm.getScheme(scheme_id);
renderJson(RetKit.renderSuccess(record));
}
+ /**
+ * 增加
+ * @param structure_name 章节目录名称
+ * @param parent_id 上级目录ID
+ * @param scheme_id 版本ID
+ * @param sort_id 排序号
+ * @param owern_id 1:东师理想提供结构,2:用户自定义结构
+ */
+ @Before({POST.class})
+ @JwtCheckInterface({})
+ public void addResourceStructure(String structure_name , int parent_id , int scheme_id , int sort_id , int owern_id){
+ bm.addResourceStructure(structure_name , parent_id , scheme_id , sort_id , owern_id );
+ renderJson(RetKit.renderSuccess("操作成功"));
+ }
+
+ /**
+ * 删除
+ * @param structure_id 主键
+ */
+ @Before({POST.class})
+ @JwtCheckInterface({})
+ @IsNumericInterface({"structure_id"})
+ public void delResourceStructureById(int structure_id){
+ bm.delResourceStructureById(structure_id);
+ renderJson(RetKit.renderSuccess("操作成功"));
+ }
+
+ /**
+ 按ID修改
+ * @param structure_id 主键
+ * @param structure_name 章节目录名称
+ * @param parent_id 上级目录ID
+ * @param scheme_id 版本ID
+ * @param sort_id 排序号
+ * @param owern_id 1:东师理想提供结构,2:用户自定义结构
+ */
+ @Before({POST.class})
+ @JwtCheckInterface({})
+ @IsNumericInterface({"structure_id"})
+ public void updateResourceStructureById(int structure_id , String structure_name , int parent_id , int scheme_id , int sort_id , int owern_id){
+ bm.updateResourceStructureById(structure_id , structure_name , parent_id , scheme_id , sort_id , owern_id );
+ renderJson(RetKit.renderSuccess("操作成功"));
+ }
+
+ /**
+ 按ID查询
+ * @para structure_id 主键
+ */
+ @Before({GET.class})
+ @JwtCheckInterface({})
+ @IsNumericInterface("{structure_id}")
+ public void getResourceStructureById(int structure_id){
+ renderJson(RetKit.renderSuccess(bm.getResourceStructureById(structure_id)));
+ }
+
+ /**
+ 分页查询
+ @param pageNum 页码
+ @param pageSize 每页数量
+ */
+ @Before({GET.class})
+ @JwtCheckInterface({})
+ public void getResourceStructureList(int pageNum, int pageSize){
+ Page listPage = bm.getResourceStructureList(pageNum, pageSize);
+ renderJson(RetKit.renderSuccess(listPage));
+ }
}
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 b02dd0e3..071e1d9a 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
@@ -239,4 +239,68 @@ public class BaseModel {
String sql = "select * from t_resource_scheme where scheme_id=?";
return Db.findFirst(sql, scheme_id);
}
+
+ /**
+ 增加
+ * @param structure_name 章节目录名称
+ * @param parent_id 上级目录ID
+ * @param scheme_id 版本ID
+ * @param sort_id 排序号
+ * @param owern_id 1:东师理想提供结构,2:用户自定义结构
+ */
+ public void addResourceStructure(String structure_name , int parent_id , int scheme_id , int sort_id , int owern_id){
+ Record record = new Record();
+ record.set("structure_name", structure_name);
+ record.set("parent_id", parent_id);
+ record.set("scheme_id", scheme_id);
+ record.set("sort_id", sort_id);
+ record.set("owern_id", owern_id);
+ Db.save("t_resource_structure","structure_id",record);
+ }
+
+ /**
+ 删除
+ @para structure_id 主键
+ */
+ public void delResourceStructureById(int structure_id){
+ String sql="delete from t_resource_structure where structure_id =?";
+ Db.update(sql,structure_id);
+ }
+
+
+ /**
+ 修改
+ * @para structure_id 主键
+ * @param structure_name 章节目录名称
+ * @param parent_id 上级目录ID
+ * @param scheme_id 版本ID
+ * @param sort_id 排序号
+ * @param owern_id 1:东师理想提供结构,2:用户自定义结构
+ */
+ public void updateResourceStructureById(int structure_id,String structure_name , int parent_id , int scheme_id , int sort_id , int owern_id){
+ String sql="update t_resource_structure set structure_name =?, parent_id =?, scheme_id =?, sort_id =?, owern_id =? where structure_id =?";
+ Db.update(sql,structure_name , parent_id , scheme_id , sort_id , owern_id ,structure_id);
+ }
+
+
+
+ /**
+ 单条查询
+ * @para structure_id 主键
+ */
+ public Record getResourceStructureById(int structure_id){
+ String sql="select * from t_resource_structure where structure_id =?";
+ return Db.findFirst(sql,structure_id);
+ }
+
+ /**
+ 分页查询
+ * @para pageNum 当前页码
+ * @para pageSize 每页显示条数
+ */
+ public Page getResourceStructureList(int pageNum, int pageSize){
+ String sql1="select * ";
+ String sql2=" from t_resource_structure";
+ return Db.paginate(pageNum, pageSize, sql1,sql2);
+ }
}
diff --git a/dsRes/src/main/java/com/dsideal/resource/JApiDocsGenerator.java b/dsRes/src/main/java/com/dsideal/resource/JApiDocsGenerator.java
index 234bc369..0aaf06a6 100644
--- a/dsRes/src/main/java/com/dsideal/resource/JApiDocsGenerator.java
+++ b/dsRes/src/main/java/com/dsideal/resource/JApiDocsGenerator.java
@@ -128,7 +128,7 @@ public class JApiDocsGenerator {
config.setProjectName(projectName); // project name
String version = "v1.0";
config.setApiVersion(version); // api version
- String docPath = projectPath + "/Doc";
+ String docPath = projectPath + "/dsRes/Doc";
config.setDocsPath(docPath); // api docs target path
config.addPlugin(new PostmanDocPlugin());
config.setAutoGenerate(Boolean.FALSE); // auto generate
diff --git a/dsUtils/src/main/java/com/dsideal/Code/t_resource_structure_Controller.txt b/dsUtils/src/main/java/com/dsideal/Code/t_resource_structure_Controller.txt
new file mode 100644
index 00000000..d43cc148
--- /dev/null
+++ b/dsUtils/src/main/java/com/dsideal/Code/t_resource_structure_Controller.txt
@@ -0,0 +1,66 @@
+/**
+* 增加
+* @param structure_name 章节目录名称
+* @param parent_id 上级目录ID
+* @param scheme_id 版本ID
+* @param sort_id 排序号
+* @param owern_id 1:东师理想提供结构,2:用户自定义结构
+*/
+@Before({POST.class})
+@JwtCheckInterface({})
+public void addResourceStructure(String structure_name , int parent_id , int scheme_id , int sort_id , int owern_id){
+ bm.addResourceStructure(structure_name , parent_id , scheme_id , sort_id , owern_id );
+ renderJson(RetKit.renderSuccess("操作成功"));
+}
+
+/**
+* 删除
+* @param structure_id 主键
+*/
+@Before({POST.class})
+@JwtCheckInterface({})
+@IsNumericInterface({"structure_id"})
+public void delResourceStructureById(int structure_id){
+ bm.delResourceStructureById(structure_id);
+ renderJson(RetKit.renderSuccess("操作成功"));
+}
+
+/**
+按ID修改
+* @param structure_id 主键
+* @param structure_name 章节目录名称
+* @param parent_id 上级目录ID
+* @param scheme_id 版本ID
+* @param sort_id 排序号
+* @param owern_id 1:东师理想提供结构,2:用户自定义结构
+*/
+@Before({POST.class})
+@JwtCheckInterface({})
+@IsNumericInterface({"structure_id"})
+public void updateResourceStructureById(int structure_id , String structure_name , int parent_id , int scheme_id , int sort_id , int owern_id){
+ bm.updateResourceStructureById(structure_id , structure_name , parent_id , scheme_id , sort_id , owern_id );
+ renderJson(RetKit.renderSuccess("操作成功"));
+}
+
+/**
+按ID查询
+* @para structure_id 主键
+*/
+@Before({GET.class})
+@JwtCheckInterface({})
+@IsNumericInterface("{structure_id}")
+public void getResourceStructureById(int structure_id){
+ renderJson(RetKit.renderSuccess(bm.getResourceStructureById(structure_id)));
+}
+
+/**
+分页查询
+@param pageNum 页码
+@param pageSize 每页数量
+*/
+@Before({GET.class})
+@JwtCheckInterface({})
+public void getResourceStructureList(int pageNum, int pageSize){
+ Page listPage = bm.getResourceStructureList(pageNum, pageSize);
+ renderJson(RetKit.renderSuccess(listPage));
+}
\ No newline at end of file
diff --git a/dsUtils/src/main/java/com/dsideal/Code/t_resource_structure_Model.txt b/dsUtils/src/main/java/com/dsideal/Code/t_resource_structure_Model.txt
new file mode 100644
index 00000000..2b81626c
--- /dev/null
+++ b/dsUtils/src/main/java/com/dsideal/Code/t_resource_structure_Model.txt
@@ -0,0 +1,65 @@
+/**
+增加
+* @param structure_name 章节目录名称
+* @param parent_id 上级目录ID
+* @param scheme_id 版本ID
+* @param sort_id 排序号
+* @param owern_id 1:东师理想提供结构,2:用户自定义结构
+*/
+public void addResourceStructure(String structure_name , int parent_id , int scheme_id , int sort_id , int owern_id){
+ Record record = new Record();
+ record.set("structure_name", structure_name);
+ record.set("parent_id", parent_id);
+ record.set("scheme_id", scheme_id);
+ record.set("sort_id", sort_id);
+ record.set("owern_id", owern_id);
+ Db.save("t_resource_structure","structure_id",record);
+}
+
+/**
+删除
+@para structure_id 主键
+*/
+public void delResourceStructureById(int structure_id){
+ String sql="delete from t_resource_structure where structure_id =?";
+ Db.update(sql,structure_id);
+}
+
+
+/**
+修改
+* @para structure_id 主键
+* @param structure_name 章节目录名称
+* @param parent_id 上级目录ID
+* @param scheme_id 版本ID
+* @param sort_id 排序号
+* @param owern_id 1:东师理想提供结构,2:用户自定义结构
+*/
+public void updateResourceStructureById(int structure_id,String structure_name , int parent_id , int scheme_id , int sort_id , int owern_id){
+ String sql="update t_resource_structure set structure_name =?, parent_id =?, scheme_id =?, sort_id =?, owern_id =? where structure_id =?";
+ Db.update(sql,structure_name , parent_id , scheme_id , sort_id , owern_id ,structure_id);
+}
+
+
+
+/**
+单条查询
+* @para structure_id 主键
+*/
+public Record getResourceStructureById(int structure_id){
+ String sql="select * from t_resource_structure where structure_id =?";
+ return Db.findFirst(sql,structure_id);
+ }
+
+/**
+分页查询
+* @para pageNum 当前页码
+* @para pageSize 每页显示条数
+*/
+public Page getResourceStructureList(int pageNum, int pageSize){
+ String sql1="select * ";
+ String sql2=" from t_resource_structure";
+ return Db.paginate(pageNum, pageSize, sql1,sql2);
+}
+
+
diff --git a/dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type_Controller.txt b/dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type_Controller.txt
deleted file mode 100644
index 0b52c4c0..00000000
--- a/dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type_Controller.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
-* 增加维修故障类型字典
-* @param type_name 类型名称
-*/
-@Before({POST.class})
-@JwtCheckInterface({})
-public void addWxFaultType(String type_name){
- ym.addWxFaultType(type_name );
- renderJson(RetKit.renderSuccess());
-}
-
-/**
-* 删除维修故障类型字典
-* @param type_id 主键
-*/
-@Before({POST.class})
-@JwtCheckInterface({})
-@IsNumericInterface({"type_id"})
-public void delWxFaultTypeById(int type_id){
- ym.delWxFaultTypeById(type_id);
- renderJson(RetKit.renderSuccess());
-}
-
-/**
-按ID修改维修故障类型字典
-* @param type_id 主键
-* @param type_name 类型名称
-*/
-@Before({POST.class})
-@JwtCheckInterface({})
-@IsNumericInterface({type_id)
-public void updateWxFaultTypeById(int type_id , String type_name){
- ym.updateWxFaultTypeById(type_id , type_name );
- renderJson(RetKit.renderSuccess());
-}
-
-/**
-按ID查询维修故障类型字典
-* @para type_id 主键
-*/
-@Before({GET.class})
-@JwtCheckInterface({})
-@IsNumericInterface("{type_id}")
-public void getWxFaultTypeById(int type_id){
- renderJson(RetKit.renderSuccess(ym.getWxFaultTypeById(type_id)));
-}
-
-/**
-分页查询维修故障类型字典
-@param pageNum 页码
-@param pageSize 每页数量
-*/
-@Before({GET.class})
-@JwtCheckInterface({})
-public void getWxFaultTypeList(int pageNum, int pageSize){
- Page listPage = ym.getWxFaultTypeList(pageNum, pageSize);
- renderJson(RetKit.renderSuccess(listPage));
-}
\ No newline at end of file
diff --git a/dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type_Model.txt b/dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type_Model.txt
deleted file mode 100644
index 9beb1f8a..00000000
--- a/dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type_Model.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
-增加维修故障类型字典
-* @param type_name 类型名称
-*/
-public void addWxFaultType(String type_name){
- Record record = new Record();
- record.set("type_name", type_name);
- Db.save("t_wx_fault_type","type_id",record);
-}
-
-/**
-删除维修故障类型字典
-@para type_id 主键
-*/
-public void delWxFaultTypeById(int type_id){
- String sql="delete from t_wx_fault_type where type_id =?";
- Db.update(sql,type_id);
-}
-
-
-/**
-修改维修故障类型字典
-* @para type_id 主键
-* @param type_name 类型名称
-*/
-public void updateWxFaultTypeById(int type_id,String type_name){
- String sql="update t_wx_fault_type set type_name =? where type_id =?";
- Db.update(sql,type_name ,type_id);
-}
-
-
-
-/**
-单条查询维修故障类型字典
-* @para type_id 主键
-*/
-public Record getWxFaultTypeById(int type_id){
- String sql="select * from t_wx_fault_type where type_id =?";
- return Db.findFirst(sql,type_id);
- }
-
-/**
-分页查询维修故障类型字典
-* @para pageNum 当前页码
-* @para pageSize 每页显示条数
-*/
-public Page getWxFaultTypeList(int pageNum, int pageSize){
- String sql1="select * ";
- String sql2=" from t_wx_fault_type";
- return Db.paginate(pageNum, pageSize, sql1,sql2);
-}
-
-
diff --git a/dsUtils/src/main/resources/Controller.ftl b/dsUtils/src/main/resources/Controller.ftl
index ad2f6308..e70146c0 100644
--- a/dsUtils/src/main/resources/Controller.ftl
+++ b/dsUtils/src/main/resources/Controller.ftl
@@ -8,7 +8,7 @@
@JwtCheckInterface({})
public void add${beanName}(${parasWithoutPrimaryKey}){
${daoName}.add${beanName}(${parasWithoutPrimaryKeyAndDataType});
- renderJson(RetKit.renderSuccess());
+ renderJson(RetKit.renderSuccess("操作成功"));
}
/**
@@ -20,7 +20,7 @@ public void add${beanName}(${parasWithoutPrimaryKey}){
@IsNumericInterface({"${primary_key}"})
public void del${beanName}ById(${primary_key_type} ${primary_key}){
${daoName}.del${beanName}ById(${primary_key});
- renderJson(RetKit.renderSuccess());
+ renderJson(RetKit.renderSuccess("操作成功"));
}
/**
@@ -32,10 +32,10 @@ public void del${beanName}ById(${primary_key_type} ${primary_key}){
*/
@Before({POST.class})
@JwtCheckInterface({})
-@IsNumericInterface({${primary_key})
+@IsNumericInterface({"${primary_key}"})
public void update${beanName}ById(${primary_key_type} ${primary_key} , ${parasWithoutPrimaryKey}){
${daoName}.update${beanName}ById(${primary_key} , ${parasWithoutPrimaryKeyAndDataType});
- renderJson(RetKit.renderSuccess());
+ renderJson(RetKit.renderSuccess("操作成功"));
}
/**
diff --git a/dsUtils/src/main/resources/application.properties b/dsUtils/src/main/resources/application.properties
index 8fe7f508..6b5ad4d6 100644
--- a/dsUtils/src/main/resources/application.properties
+++ b/dsUtils/src/main/resources/application.properties
@@ -8,10 +8,10 @@ jdbcUrl=jdbc:mysql://10.10.14.210:22066/ds_db?useUnicode=true&characterEncoding=
beanPath=D:/dsWork/dsProject/dsUtils/src/main/java/com/dsideal/Code
# 表
-tableName=t_wx_fault_type
+tableName=t_resource_structure
# dao的名称
-daoName=ym
+daoName=bm
diff --git a/dsUtils/target/classes/Controller.ftl b/dsUtils/target/classes/Controller.ftl
index ad2f6308..e70146c0 100644
--- a/dsUtils/target/classes/Controller.ftl
+++ b/dsUtils/target/classes/Controller.ftl
@@ -8,7 +8,7 @@
@JwtCheckInterface({})
public void add${beanName}(${parasWithoutPrimaryKey}){
${daoName}.add${beanName}(${parasWithoutPrimaryKeyAndDataType});
- renderJson(RetKit.renderSuccess());
+ renderJson(RetKit.renderSuccess("操作成功"));
}
/**
@@ -20,7 +20,7 @@ public void add${beanName}(${parasWithoutPrimaryKey}){
@IsNumericInterface({"${primary_key}"})
public void del${beanName}ById(${primary_key_type} ${primary_key}){
${daoName}.del${beanName}ById(${primary_key});
- renderJson(RetKit.renderSuccess());
+ renderJson(RetKit.renderSuccess("操作成功"));
}
/**
@@ -32,10 +32,10 @@ public void del${beanName}ById(${primary_key_type} ${primary_key}){
*/
@Before({POST.class})
@JwtCheckInterface({})
-@IsNumericInterface({${primary_key})
+@IsNumericInterface({"${primary_key}"})
public void update${beanName}ById(${primary_key_type} ${primary_key} , ${parasWithoutPrimaryKey}){
${daoName}.update${beanName}ById(${primary_key} , ${parasWithoutPrimaryKeyAndDataType});
- renderJson(RetKit.renderSuccess());
+ renderJson(RetKit.renderSuccess("操作成功"));
}
/**
diff --git a/dsUtils/target/classes/application.properties b/dsUtils/target/classes/application.properties
index 8fe7f508..6b5ad4d6 100644
--- a/dsUtils/target/classes/application.properties
+++ b/dsUtils/target/classes/application.properties
@@ -8,10 +8,10 @@ jdbcUrl=jdbc:mysql://10.10.14.210:22066/ds_db?useUnicode=true&characterEncoding=
beanPath=D:/dsWork/dsProject/dsUtils/src/main/java/com/dsideal/Code
# 表
-tableName=t_wx_fault_type
+tableName=t_resource_structure
# dao的名称
-daoName=ym
+daoName=bm