huanghai
/
dsProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://10.10.14.176:3000/huanghai/dsExam

Browse Source
main
kgdxpr 9 months ago
parent 52da3d98f1 f1fb8d5fe6
commit 52d908a40d
9 changed files with 136 additions and 103 deletions
Show Stats Download Patch File Download Diff File

4
dsBaseWeb/default.conf
Unescape View File

@ -13,6 +13,10 @@ server {
location /dsBase {
proxy_pass http://dsBaseService/dsBase;
}
location /ZhuQue {
proxy_pass http://zhuQueService/ZhuQue;
}
location /saas {
proxy_pass http://yltsaas.ikbvip.com/saas;

5
dsBaseWeb/nginx.conf
Unescape View File

@ -28,8 +28,11 @@ http {
#gzip on;
upstream dsBaseService {
server ds-base:8001;
server ds-base:8001;
}
upstream zhuQueService {
server zhu-que:9000;
}
include /etc/nginx/conf.d/*.conf;
}

19
dsBuild/target/classes/.kube/config
Unescape View File

@ -1,19 +0,0 @@
apiVersion: v1
clusters:
- cluster:
certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURCVENDQWUyZ0F3SUJBZ0lJQ3pNUkpBbEJVSzB3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TkRBNU1URXdPREUyTlRSYUZ3MHpOREE1TURrd09ESXhOVFJhTUJVeApFekFSQmdOVkJBTVRDbXQxWW1WeWJtVjBaWE13Z2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLCkFvSUJBUUNobzZhakc4RVFiNktyUDhnd3BpOEoyMFFNRGxRNGYvYkJJSGVCVS9mN28yc3ZjcmRPUktvVGxDVnQKMHpvWmJuZHhrd0pNaURBZVJ4Z3R2NHBQTnFwNlV4M2tMZ1NqRE55Mnl4NThUOXdEc3M5YkJvNUlza01GZ2JNUQp3K3NGWEVCelN5R3B0aVA2L3FKbU5mYVlQcWhIRkRpdlJkRjFqTVJKK2JpNlNTakhPSmJ6aXhnd2VjSFMxdVY0CmZldkczNWROckZCZEI4WVNmczY0cGwvOXdiWC84S0s5M1ovWUF1K1RVNUF4T0FhY0c5U3FKWEZQajJoS01QT3gKcHYwc1ExTVIxSmduazF1MEx6T2RoWDdOOTkydThRRVZHQ1hwQmRjOWxVQSt4MmhPc2lUWjE1WW1GWmxQdStmYgo4UjhvYitNZ0NIdGNkUUtzOXFFSnB3L1h3aU1qQWdNQkFBR2pXVEJYTUE0R0ExVWREd0VCL3dRRUF3SUNwREFQCkJnTlZIUk1CQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXQkJUZk9hNWlyRmJBSGdxaVZkMFFnRURia2s1QlpEQVYKQmdOVkhSRUVEakFNZ2dwcmRXSmxjbTVsZEdWek1BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQWpzQ3pXUTFnKwprc0lvNTg5Y1ZncFVOSFlIaWhVRXlpcDhUbE1ySGR3eFBuU0dOaFNyS0haTGJkVWZnWWorR2x3QlRHcXVrL3JzCmR0dWZWUmxaNXA1ZlUzZSs2SW5CY0xmWFdEaGRRMFlvSUpzSU4rbUZCL01haDBjQkxlQzZqOWN1eXArcWllUXAKMml6ZDJzb1F6cjN2TmlQM3l1T0NOU0dGdFBvdXRHUis5YWJzVC9lYUMzVTJvcFo4Tm5KenVFb2ljQnV4ZWt2SApIZVZadHhCT3l5QkpWbzEyZzdmTVhuSm1PRlR6TmhCdVpzVFZ1cndTZTdPTmtLOUVsbHBXeCtWcGRhOXdPZ3NOCmFId010Qkc1YUJVTDU0T0Fac004eXpJaldtb0dPZzBySkl1Mjk0YTNXTjJhR2UrMHFWdVdpV2U4N2k1SWVNcHAKSE05amswUVBrbjFaCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
server: https://10.10.14.200:6443
name: kubernetes
contexts:
- context:
cluster: kubernetes
user: kubernetes-admin
name: kubernetes-admin@kubernetes
current-context: kubernetes-admin@kubernetes
kind: Config
preferences: {}
users:
- name: kubernetes-admin
user:
client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURLVENDQWhHZ0F3SUJBZ0lJWmVoaXMzR3dHVUF3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TkRBNU1URXdPREUyTlRSYUZ3MHlOVEE1TVRFd09ESXlNREJhTUR3eApIekFkQmdOVkJBb1RGbXQxWW1WaFpHMDZZMngxYzNSbGNpMWhaRzFwYm5NeEdUQVhCZ05WQkFNVEVHdDFZbVZ5CmJtVjBaWE10WVdSdGFXNHdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFEcDFvNzcKNzJaOWhERVdJQWVldm5YYXVWRG5aZkdlNGF2Ly90cDhudjlHTHBNd2hOT0JaaEpZNE55SkhhQTdYVTAvVTVBYwpSWG01VVNJb0NaRU9FQXpjNW9kOGNZNm5sOE9qMUhxa0dDZG1ZcllpMUVKRElDdnJ4d1phQ2RCRVYxNzJ1WFJYCitSY1hxaDdlcWRPRDJ4SHl0N2ZBZXFHQ3NSVjNnbFJ3ak5DMUovalFnRmtYUGs3NXdXZDRDcXh4VVEvcXdNeUUKVVRlVTg0SHFTZzRzVzRpU1gwbm83YnBlNTZNRG8rMnZYTmVDQzQwZGNJMVRWZDAyc21PbEx6VGhtd1M4U05PSAo3bUdlSkJWZ2hlaXRyR3kwSjlWT1NXdyszVHl1NEdQZm1YbmhPeU5DUVR6UVMzUDNQNmlyNzR4UGRUci9JT2JrCno3bGE3SjdIdjV6MGZUcnhBZ01CQUFHalZqQlVNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUsKQmdnckJnRUZCUWNEQWpBTUJnTlZIUk1CQWY4RUFqQUFNQjhHQTFVZEl3UVlNQmFBRk44NXJtS3NWc0FlQ3FKVgozUkNBUU51U1RrRmtNQTBHQ1NxR1NJYjNEUUVCQ3dVQUE0SUJBUUI5dzRmd2RhS1R3L3YxODlhK01LbHM3c3NTCml5SnNDd0RDQUtHMnY4UmhNTXl6N2JkaTM0M1JOMFJHQnU5bGZKWk0zNWlpNXA1c29nK2NGcnlBb1FYVVI5cmEKS0NBS1VXNUg5eE90Qm95S3hYaXFkNTd6WWs5VVlUNDdEYkh4VllSaVgwNWZpaWM0NVNxT0pBNUdzUGNDdmlObwowYVo0MnFISTkrVnB5WXN5TGN1eGd3U1lkR1h5VjdiR1liclVDZmpwNk5USnVOTEh0NTl4VGtaNWNsZzdCTEFNCkVPV2E3WWVZWDE3VUdHbmh6YUN1WngvNzJZaXBWdkNLdjR5VXRTZVJpMm1HRnpZWXBoSmpXdm9wR1VoQUM5MWYKTlFUWEE1ZU9VTTZpOFo2OG5YRE9WUWFTb3BNbnZvZGM2UDlwSFR6YkVHdGdmdW82czI2dkoyRTZsUlVUCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBNmRhTysrOW1mWVF4RmlBSG5yNTEycmxRNTJYeG51R3IvLzdhZko3L1JpNlRNSVRUCmdXWVNXT0RjaVIyZ08xMU5QMU9RSEVWNXVWRWlLQW1SRGhBTTNPYUhmSEdPcDVmRG85UjZwQmduWm1LMkl0UkMKUXlBcjY4Y0dXZ25RUkZkZTlybDBWL2tYRjZvZTNxblRnOXNSOHJlM3dIcWhnckVWZDRKVWNJelF0U2Y0MElCWgpGejVPK2NGbmVBcXNjVkVQNnNETWhGRTNsUE9CNmtvT0xGdUlrbDlKNk8yNlh1ZWpBNlB0cjF6WGdndU5IWENOClUxWGROckpqcFM4MDRac0V2RWpUaCs1aG5pUVZZSVhvcmF4c3RDZlZUa2xzUHQwOHJ1QmozNWw1NFRzalFrRTgKMEV0ejl6K29xKytNVDNVNi95RG01TSs1V3V5ZXg3K2M5SDA2OFFJREFRQUJBb0lCQVFDcklpNlVyTmxLUk9PVAp1Szg2KzFMUFYwNmhleGRBMnhJQkVTZ2ZpbEZ5c0lWaVBlTjQwUlhlVy9xcWtyY0FtMEQ4ZHBDQ1VFcE1XTmR4Cmk4YlFEdWtMQmQva01FdGgxZzBGS216ekNRWlV4U3RkQkJEV2hZWC9VVElSMVJySjJWT1RwNWhCQmZoamhrcC8KVkxTS3pGb3ZVMHMwbjhyeUZkMkxFQ1B5RnV4cmxzWWk3dlAwSmIyMllFTTJqZXBaZ1dVU3FyR2xQWmo3YmZ2SApZbC9MSGZ3bmM5cU1VUzJHV2tDeUR5bWdCSVJ1SnA1S0FSTTNRaHd1UlhsekFiT1hSUFZyd3FXKzlEdHpzT0x3CkRITDNXYytYVG90QkJmZ2RkdG1leHNlRmp2TFF1QlQ5ZUI1RHg1dDRGQU9lRUM2T09Fa0R1RHM2dWpmYUNIK3IKa0s5RE56TTlBb0dCQU82dGkyS0xjaEkvYUZEQ3ZDcGJpUWl3RUg1QnhNeU5rTVFnbDAxbUg4Vi9VckFxUTZxawpRcTRkSkZzYnl5NC9tVjZNTGE3eDRGM1c2Z04rQ1lvZEh3WmlDOGQzM3o5RzRFYjVrZUFZTml2VUR3bHRGYU54Clp4M0hRQ0RYV05LRzV4U2NVRmxIOU1iQjAyM2h3d2Y2ZmNEa0N6c2pHanJlWHpYOVJzT2dHOGF6QW9HQkFQclAKR0N6QXJ0QUh1YUVhbUVBMm9SN1kzWDJwaEdxQ3p4eWR5VWdNb1Zab0w5S0hhdmZqb3h3UW5leElMcDlZSnpXegpSUHlKRm5qK2JmU1VWYUdxMWNGTWhyVGZUL1NOSTZadUxEbmhybzczaWNnbXNIZG5lVURidUt4Nkg5NSs3Q1RkCmRJY1dxWXpBMncxOWk1UXlyMlM4RU91K0Fmb0QzREp0dk1OM3pDbkxBb0dBZEdGQzJlWk0xUUQrQ0lNcjVTdUYKQWl0M24xaktjVU9HRjF3YzZxeWxTVlB3S2Q0eDZINzMxSlo1SjhQQnF1ZHdEVjRrMkcwd2poRkJRanF1eEIyMwpCeEcvMUo5cXlCdnpPQ2h4TE9naFlmV2c3Mk8xYldEYWV2YXhHbEpuQ1NDbWhMSkRxNFVlb2R2WkVIZEk5aGI2ClFwZnZzZ0pIdy9TeVVFMFR1RWZWdzJrQ2dZQVQwOTFvWkU4dG1QNiswcmhva3lrSHBFTldWTmxvQmpGVFpOSHQKeFRuWDkrS1g5U2FxdEM5SDM3UnNZb1IxQ21ZSEk4WDNaT3NHNDY1VG9JcG9mblhwa3lBdkdseGF5L0dlamFVbgpha1QvZm1oQkQzWHg2cGMyWG1ocUVqbUV3R253dkNVakxOSjRreUorSFllMFRwRjVHRGtLT2ZvMEJxd1l2SDRvCndjYTlJd0tCZ0RPLzVxcnFzZFZOdHljZFduQ1BhU1orR3QyMGIyMDI1QzFXZXBraVd4ZWs4eTEzNDRkWnRQaWYKOFhoTVZpNzBhYkt3QWNBeVdlWmdKNXM5bm41NlFFcHlCRFN1L2o0Tk5CczZieGNwbUZ4d3phaTFJdkd5NGRVRwpialorZ2NXMXVFQTZDQ3FrYnQ0Smh2RkVEVUZmUUlQMUZaZ1JNc2g4OFpnZ2FjV2YrRktMCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==

6
dsBuild/target/classes/publishImage.json
Unescape View File

@ -1,6 +0,0 @@
{
"host": "10.10.14.212",
"user": "root",
"pwd": "dsideal",
"port": 22
}

7
dsRes/pom.xml
Unescape View File

@ -185,6 +185,13 @@
<artifactId>jackson-databind</artifactId>
<version>2.17.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310 -->
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.18.0</version>
</dependency>
<!--引用ssh+sftp组件-->
<!-- https://mvnrepository.com/artifact/com.github.mwiede/jsch -->
<dependency>

65
dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java
Unescape View File

@ -145,9 +145,9 @@ public class BaseController extends Controller {
*/
@Before({POST.class})
@JwtCheckInterface({})
@EmptyInterface({"scheme_name", "owner_id"})
@IsNumericInterface({"stage_id", "subject_id", "type_id", "sort_id"})
public void addScheme(String scheme_name, int stage_id, int subject_id, String owner_id, int type_id, int sort_id) {
@EmptyInterface({"scheme_name"})
@IsNumericInterface({"stage_id", "subject_id", "type_id", "sort_id", "owner_id"})
public void addScheme(String scheme_name, int stage_id, int subject_id, int owner_id, int type_id, int sort_id) {
//1、检查此名称的版本是否已经存在，存在的不能继续添加
if (bm.checkSchemeName(scheme_name, stage_id)) {
renderJson(RetKit.renderFail("该版本名称已存在"));
@ -222,70 +222,73 @@ 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：用户自定义结构
*
* @param structure_name 章节目录名称
* @param parent_id 上级目录ID
* @param scheme_id 版本ID
* @param sort_id 排序号
*/
@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 );
public void addResourceStructure(String structure_name, int parent_id, int scheme_id, int sort_id) {
bm.addResourceStructure(structure_name, parent_id, scheme_id, sort_id);
renderJson(RetKit.renderSuccess("操作成功"));
}
/**
* 删除资源目录结构
* @param structure_id 主键
*
* @param structure_id 主键
*/
@Before({POST.class})
@JwtCheckInterface({})
@IsNumericInterface({"structure_id"})
public void delResourceStructureById(int 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：用户自定义结构
* 按ID修改资源目录结构
*
* @param structure_id 主键
* @param structure_name 章节目录名称
* @param parent_id 上级目录ID
* @param scheme_id 版本ID
* @param sort_id 排序号
*/
@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 );
public void updateResourceStructureById(int structure_id, String structure_name, int parent_id, int scheme_id, int sort_id) {
bm.updateResourceStructureById(structure_id, structure_name, parent_id, scheme_id, sort_id);
renderJson(RetKit.renderSuccess("操作成功"));
}
/**
按ID查询资源目录结构
* 按ID查询资源目录结构
*
* @param structure_id 主键
*/
@Before({GET.class})
@JwtCheckInterface({})
@IsNumericInterface("{structure_id}")
public void getResourceStructureById(int structure_id){
@IsNumericInterface({"structure_id"})
public void getResourceStructureById(int structure_id) {
renderJson(RetKit.renderSuccess(bm.getResourceStructureById(structure_id)));
}
/**
分页查询资源目录结构
@param pageNum 页码
@param pageSize 每页数量
* 分页查询资源目录结构
*
* @param scheme_id 版本ID
*/
@Before({GET.class})
@JwtCheckInterface({})
public void getResourceStructureList(int pageNum, int pageSize){
Page<Record> listPage = bm.getResourceStructureList(pageNum, pageSize);
renderJson(RetKit.renderSuccess(listPage));
//@JwtCheckInterface({})
public void fetchStructure(int scheme_id) {
List<Record> list = bm.fetchStructure(scheme_id, -1);
renderJson(RetKit.renderSuccess("成功", list));
}
}

100
dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java
Unescape View File

@ -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;
@ -172,7 +173,7 @@ public class BaseModel {
* @param type_id
* @param sort_id
*/
public void addScheme(String scheme_name, int stage_id, int subject_id, int b_use, String owner_id, int type_id, int sort_id) {
public void addScheme(String scheme_name, int stage_id, int subject_id, int b_use, int owner_id, int type_id, int sort_id) {
Record record = new Record();
record.set("scheme_name", scheme_name);
record.set("stage_id", stage_id);
@ -181,7 +182,9 @@ public class BaseModel {
record.set("owner_id", owner_id);
record.set("type_id", type_id);
record.set("sort_id", sort_id);
Db.save("t_resource_scheme","scheme_id", record);
Db.save("t_resource_scheme", "scheme_id", record);
//需要同步增加t_resource_structure表中的数据
addResourceStructure(scheme_name, -1, record.getInt("id"), 1);
}
/**
@ -192,6 +195,9 @@ public class BaseModel {
public void delScheme(int scheme_id) {
String sql = "update t_resource_scheme set b_use=0 where scheme_id=?";
Db.update(sql, scheme_id);
//同步删除t_resource_structure表中的数据
sql = "update t_resource_structure set b_use=0 where scheme_id=?";
Db.update(sql, scheme_id);
}
/**
@ -204,9 +210,12 @@ public class BaseModel {
* @param type_id
* @param sort_id
*/
public void updateScheme(int scheme_id, String scheme_name, int stage_id, int subject_id, int type_id, int sort_id) {
public void updateScheme(int scheme_id, String scheme_name, int stage_id, int subject_id, int type_id, int sort_id) {
String sql = "update t_resource_scheme set scheme_name=?,stage_id=?,subject_id=?,type_id=?,sort_id=? where scheme_id=?";
Db.update(sql, scheme_name, stage_id, subject_id, type_id, sort_id, scheme_id);
Db.update(sql, scheme_name, stage_id, subject_id, type_id, sort_id, scheme_id);
//同步修改t_resource_structure表中的数据
sql = "update t_resource_structure set structure_name=? where scheme_id=? and parent_id=-1";
Db.update(sql, scheme_name, scheme_id);
}
/**
@ -241,66 +250,75 @@ public class BaseModel {
}
/**
增加
* @param structure_name 章节目录名称
* @param parent_id 上级目录ID
* @param scheme_id 版本ID
* @param sort_id 排序号
* @param owern_id 1：东师理想提供结构，2：用户自定义结构
* 增加
*
* @param structure_name 章节目录名称
* @param parent_id 上级目录ID
* @param scheme_id 版本ID
* @param sort_id 排序号
*/
public void addResourceStructure(String structure_name , int parent_id , int scheme_id , int sort_id , int owern_id){
public void addResourceStructure(String structure_name, int parent_id, int scheme_id, int sort_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);
Db.save("t_resource_structure", "structure_id", record);
}
/**
删除
@param structure_id 主键
* 删除
*
* @param structure_id 主键
*/
public void delResourceStructureById(int structure_id){
String sql="delete from t_resource_structure where structure_id =?";
Db.update(sql,structure_id);
public void delResourceStructureById(int structure_id) {
String sql = "delete from t_resource_structure where structure_id =?";
Db.update(sql, structure_id);
}
/**
修改
* @param structure_id 主键
* @param structure_name 章节目录名称
* @param parent_id 上级目录ID
* @param scheme_id 版本ID
* @param sort_id 排序号
* @param owern_id 1：东师理想提供结构，2：用户自定义结构
* 修改
*
* @param structure_id 主键
* @param structure_name 章节目录名称
* @param parent_id 上级目录ID
* @param scheme_id 版本ID
* @param sort_id 排序号
*/
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);
public void updateResourceStructureById(int structure_id, String structure_name, int parent_id, int scheme_id, int sort_id) {
String sql = "update t_resource_structure set structure_name =?, parent_id =?, scheme_id =?, sort_id =? where structure_id =?";
Db.update(sql, structure_name, parent_id, scheme_id, sort_id, structure_id);
}
/**
单条查询
* 单条查询
*
* @param structure_id 主键
*/
public Record getResourceStructureById(int structure_id){
String sql="select * from t_resource_structure where structure_id =?";
return Db.findFirst(sql,structure_id);
public Record getResourceStructureById(int structure_id) {
String sql = "select * from t_resource_structure where structure_id =?";
return Db.findFirst(sql, structure_id);
}
/**
分页查询
* @param pageNum 当前页码
* @param pageSize 每页显示条数
* 根据版本号获取章节目录信息
*
* @param scheme_id 版本号
* @return 结构信息
*/
public Page<Record> getResourceStructureList(int pageNum, int pageSize){
String sql1="select * ";
String sql2=" from t_resource_structure";
return Db.paginate(pageNum, pageSize, sql1,sql2);
public List<Record> 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<Record> list = Db.find(sql, scheme_id, parent_id);
List<Record> res = new ArrayList<>();
for (Record rs : list) {
int structure_id = rs.getInt("structure_id");
// 递归查找子菜单
List<Record> childStructure = fetchStructure(scheme_id, structure_id);
rs.set("children", childStructure);
res.add(rs);
}
return res;
}
}

22
dsRes/src/main/java/com/dsideal/resource/Test/testDb.java
Unescape View File

@ -1,16 +1,26 @@
package com.dsideal.resource.Test;
import com.dsideal.resource.Base.Model.BaseModel;
import com.dsideal.resource.Plugin.YamlProp;
import com.dsideal.resource.ResApplication;
import com.dsideal.resource.Util.RetKit;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.jfinal.kit.Prop;
import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
import com.jfinal.plugin.hikaricp.HikariCpPlugin;
import com.jfinal.plugin.activerecord.Record;
import java.io.File;
import java.util.List;
import java.util.Map;
public class testDb {
public static void main(String[] args) {
public static void main(String[] args) throws JsonProcessingException {
//加载配置文件
String configFile = "application_dev.yaml";
Prop PropKit = new YamlProp(configFile);
@ -35,6 +45,16 @@ public class testDb {
}
masterArp.start();
BaseModel bm = new BaseModel();
List<Record> list = bm.fetchStructure(1, -1);
System.out.println(list);
Map<String, Object> map = RetKit.renderSuccess("成功", list, null, 1, 99999, list.size());
ObjectMapper mapper = new ObjectMapper();
mapper.registerModule(new JavaTimeModule()); // 注册 JavaTimeModule
mapper.enable(SerializationFeature.INDENT_OUTPUT); // 启用美化输出
String jsonString = mapper.writeValueAsString(map);
System.out.println(jsonString);
}
}

11
dsRes/src/main/resources/Sql/base.sql
Unescape View File

@ -2,13 +2,16 @@
#namespace("Base")
#sql("listScheme")
select * from t_resource_scheme where b_use=1
select t1.*,t2.subject_name,t3.stage_name from t_resource_scheme as t1
inner join t_dm_subject as t2 on t1.subject_id=t2.subject_id
inner join t_dm_stage as t3 on t1.stage_id=t3.stage_id
where t1.b_use=1
#if(stage_id)
and stage_id=#para(stage_id)
and t1.stage_id=#para(stage_id)
#end
#if(subject_id)
and subject_id=#para(subject_id)
and t1.subject_id=#para(subject_id)
#end
order by stage_id,sort_id
order by t1.stage_id,t1.sort_id
#end
#end
Write Preview
Loading…
Cancel
Save