diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/pom.xml b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/pom.xml
index 2bc55493..60242de7 100644
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/pom.xml
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/pom.xml
@@ -16,6 +16,11 @@
org.jeecgframework.boot
jeecg-boot-base-core
+
+
+ org.jeecgframework.boot
+ jeecg-system-local-api
+
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/business/controller/CourseBusinessController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/business/controller/CourseBusinessController.java
index 564f9882..d840e200 100644
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/business/controller/CourseBusinessController.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/business/controller/CourseBusinessController.java
@@ -4,13 +4,22 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
import org.jeecg.config.shiro.IgnoreAuth;
import org.jeecg.modules.learn.gen.entity.Course;
import org.jeecg.modules.learn.gen.service.ICourseService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import org.jeecg.common.system.api.ISysBaseAPI;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
@Tag(name="课程")
@RestController
@@ -25,4 +34,16 @@ public class CourseBusinessController extends JeecgController test2(HttpServletRequest request, HttpServletResponse response) {
+ String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN);
+ String username = JwtUtil.getUsername(token);
+ LoginUser sysUser = sysBaseApi.getUserByName(username);
+ return Result.OK(sysUser.toString());
+ }
+
}
diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/controller/CourseController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/controller/CourseController.java
index b2e42ca8..4518332d 100644
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/controller/CourseController.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/controller/CourseController.java
@@ -14,7 +14,6 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.config.shiro.IgnoreAuth;
import org.jeecg.modules.learn.gen.entity.Course;
import org.jeecg.modules.learn.gen.service.ICourseService;
@@ -52,7 +51,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
public class CourseController extends JeecgController {
@Autowired
private ICourseService courseService;
-
+
/**
* 分页列表查询
*
diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/entity/Course.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/entity/Course.java
index 473f0653..fc4bbf54 100644
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/entity/Course.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/entity/Course.java
@@ -73,4 +73,8 @@ public class Course implements Serializable {
@Dict(dictTable = "demo", dicText = "name", dicCode = "id")
@Schema(description = "所属分类")
private java.lang.String categoryId;
+ /**teasta*/
+ @Excel(name = "teasta", width = 15)
+ @Schema(description = "teasta")
+ private java.lang.String teststst;
}
diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/Course.api.ts b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/Course.api.ts
new file mode 100644
index 00000000..fa5a4898
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/Course.api.ts
@@ -0,0 +1,64 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+ list = '/gen/course/list',
+ save='/gen/course/add',
+ edit='/gen/course/edit',
+ deleteOne = '/gen/course/delete',
+ deleteBatch = '/gen/course/deleteBatch',
+ importExcel = '/gen/course/importExcel',
+ exportXls = '/gen/course/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+ defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+ return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+ createConfirm({
+ iconType: 'warning',
+ title: '确认删除',
+ content: '是否删除选中数据',
+ okText: '确认',
+ cancelText: '取消',
+ onOk: () => {
+ return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+ }
+ });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+ let url = isUpdate ? Api.edit : Api.save;
+ return defHttp.post({url: url, params});
+}
diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/Course.data.ts b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/Course.data.ts
new file mode 100644
index 00000000..213d7b7d
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/Course.data.ts
@@ -0,0 +1,105 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+ {
+ title: '课程名',
+ align:"center",
+ dataIndex: 'name'
+ },
+ {
+ title: '图片',
+ align:"center",
+ dataIndex: 'cover',
+ customRender:render.renderImage,
+ },
+ {
+ title: '描述',
+ align:"center",
+ dataIndex: 'description',
+ },
+ {
+ title: '所属分类',
+ align:"center",
+ dataIndex: 'categoryId_dictText'
+ },
+ {
+ title: 'teasta',
+ align:"center",
+ dataIndex: 'teststst'
+ },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+ {
+ label: "所属分类",
+ field: 'categoryId',
+ component: 'JSelectMultiple',
+ componentProps:{
+ dictCode:"demo,name,id"
+ },
+ //colProps: {span: 6},
+ },
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+ {
+ label: '课程名',
+ field: 'name',
+ component: 'Input',
+ },
+ {
+ label: '图片',
+ field: 'cover',
+ component: 'JImageUpload',
+ componentProps:{
+ fileMax: 0
+ },
+ },
+ {
+ label: '描述',
+ field: 'description',
+ component: 'JEditor',
+ },
+ {
+ label: '所属分类',
+ field: 'categoryId',
+ component: 'JDictSelectTag',
+ componentProps:{
+ dictCode:"demo,name,id"
+ },
+ },
+ {
+ label: 'teasta',
+ field: 'teststst',
+ component: 'Input',
+ },
+ // TODO 主键隐藏字段,目前写死为ID
+ {
+ label: '',
+ field: 'id',
+ component: 'Input',
+ show: false
+ },
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+ name: {title: '课程名',order: 0,view: 'text', type: 'string',},
+ cover: {title: '图片',order: 1,view: 'image', type: 'string',},
+ description: {title: '描述',order: 2,view: 'umeditor', type: 'string',},
+ categoryId: {title: '所属分类',order: 3,view: 'list', type: 'string',dictTable: "demo", dictCode: 'id', dictText: 'name',},
+ teststst: {title: 'teasta',order: 4,view: 'text', type: 'string',},
+};
+
+/**
+* 流程表单调用这个方法获取formSchema
+* @param param
+*/
+export function getBpmFormSchema(_formData): FormSchema[]{
+ // 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema
+ return formSchema;
+}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/CourseList.vue b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/CourseList.vue
new file mode 100644
index 00000000..d3103737
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/CourseList.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+ 新增
+ 导出
+ 导入
+
+
+
+
+
+
+ 删除
+
+
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/V20250807_1__menu_insert_Course.sql b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/V20250807_1__menu_insert_Course.sql
new file mode 100644
index 00000000..89d454b8
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/V20250807_1__menu_insert_Course.sql
@@ -0,0 +1,26 @@
+-- 注意:该页面对应的前台目录为views/gen文件夹下
+-- 如果你想更改到其他目录,请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
+VALUES ('2025080707256120180', NULL, '课程', '/gen/courseList', 'gen/CourseList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-08-07 19:25:18', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025080707256130181', '2025080707256120180', '添加课程', NULL, NULL, 0, NULL, NULL, 2, 'gen:course:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-07 19:25:18', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025080707256130182', '2025080707256120180', '编辑课程', NULL, NULL, 0, NULL, NULL, 2, 'gen:course:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-07 19:25:18', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025080707256130183', '2025080707256120180', '删除课程', NULL, NULL, 0, NULL, NULL, 2, 'gen:course:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-07 19:25:18', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025080707256130184', '2025080707256120180', '批量删除课程', NULL, NULL, 0, NULL, NULL, 2, 'gen:course:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-07 19:25:18', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025080707256130185', '2025080707256120180', '导出excel_课程', NULL, NULL, 0, NULL, NULL, 2, 'gen:course:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-07 19:25:18', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025080707256130186', '2025080707256120180', '导入excel_课程', NULL, NULL, 0, NULL, NULL, 2, 'gen:course:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-07 19:25:18', NULL, NULL, 0, 0, '1', 0);
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/components/CourseForm.vue b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/components/CourseForm.vue
new file mode 100644
index 00000000..9fc0480a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/components/CourseForm.vue
@@ -0,0 +1,70 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/components/CourseModal.vue b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/components/CourseModal.vue
new file mode 100644
index 00000000..7affc85c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/components/CourseModal.vue
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecgboot-vue3/src/views/learn/Course.api.ts b/jeecgboot-vue3/src/views/learn/Course.api.ts
index 44203624..fa5a4898 100644
--- a/jeecgboot-vue3/src/views/learn/Course.api.ts
+++ b/jeecgboot-vue3/src/views/learn/Course.api.ts
@@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
- list = '/learn/course/list',
- save='/learn/course/add',
- edit='/learn/course/edit',
- deleteOne = '/learn/course/delete',
- deleteBatch = '/learn/course/deleteBatch',
- importExcel = '/learn/course/importExcel',
- exportXls = '/learn/course/exportXls',
+ list = '/gen/course/list',
+ save='/gen/course/add',
+ edit='/gen/course/edit',
+ deleteOne = '/gen/course/delete',
+ deleteBatch = '/gen/course/deleteBatch',
+ importExcel = '/gen/course/importExcel',
+ exportXls = '/gen/course/exportXls',
}
/**
* 导出api
diff --git a/jeecgboot-vue3/src/views/learn/Course.data.ts b/jeecgboot-vue3/src/views/learn/Course.data.ts
index 931d3953..213d7b7d 100644
--- a/jeecgboot-vue3/src/views/learn/Course.data.ts
+++ b/jeecgboot-vue3/src/views/learn/Course.data.ts
@@ -26,6 +26,11 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'categoryId_dictText'
},
+ {
+ title: 'teasta',
+ align:"center",
+ dataIndex: 'teststst'
+ },
];
//查询数据
export const searchFormSchema: FormSchema[] = [
@@ -66,6 +71,11 @@ export const formSchema: FormSchema[] = [
componentProps:{
dictCode:"demo,name,id"
},
+ },
+ {
+ label: 'teasta',
+ field: 'teststst',
+ component: 'Input',
},
// TODO 主键隐藏字段,目前写死为ID
{
@@ -82,6 +92,7 @@ export const superQuerySchema = {
cover: {title: '图片',order: 1,view: 'image', type: 'string',},
description: {title: '描述',order: 2,view: 'umeditor', type: 'string',},
categoryId: {title: '所属分类',order: 3,view: 'list', type: 'string',dictTable: "demo", dictCode: 'id', dictText: 'name',},
+ teststst: {title: 'teasta',order: 4,view: 'text', type: 'string',},
};
/**
diff --git a/jeecgboot-vue3/src/views/learn/CourseList.vue b/jeecgboot-vue3/src/views/learn/CourseList.vue
index 1cee094b..d3103737 100644
--- a/jeecgboot-vue3/src/views/learn/CourseList.vue
+++ b/jeecgboot-vue3/src/views/learn/CourseList.vue
@@ -4,9 +4,9 @@
- 新增
- 导出
- 导入
+ 新增
+ 导出
+ 导入
@@ -17,7 +17,7 @@
- 批量操作
+ 批量操作
@@ -41,7 +41,7 @@
-