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 4518332d..4dc27d46 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 @@ -70,11 +70,7 @@ public class CourseController extends JeecgController { HttpServletRequest req) { - // 自定义查询规则 - Map customeRuleMap = new HashMap<>(); - // 自定义多选的查询规则为:LIKE_WITH_OR - customeRuleMap.put("categoryId", QueryRuleEnum.LIKE_WITH_OR); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(course, req.getParameterMap(),customeRuleMap); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(course, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = courseService.page(page, queryWrapper); return Result.OK(pageList); 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 fc4bbf54..2e7f816c 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 @@ -60,21 +60,4 @@ public class Course implements Serializable { @Excel(name = "课程名", width = 15) @Schema(description = "课程名") private java.lang.String name; - /**图片*/ - @Excel(name = "图片", width = 15) - @Schema(description = "图片") - private java.lang.String cover; - /**描述*/ - @Excel(name = "描述", width = 15) - @Schema(description = "描述") - private java.lang.String description; - /**所属分类*/ - @Excel(name = "所属分类", width = 15, dictTable = "demo", dicText = "name", dicCode = "id") - @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.data.ts b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/Course.data.ts deleted file mode 100644 index 213d7b7d..00000000 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/Course.data.ts +++ /dev/null @@ -1,105 +0,0 @@ -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 deleted file mode 100644 index d3103737..00000000 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/CourseList.vue +++ /dev/null @@ -1,210 +0,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/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 deleted file mode 100644 index 89d454b8..00000000 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/V20250807_1__menu_insert_Course.sql +++ /dev/null @@ -1,26 +0,0 @@ --- 注意:该页面对应的前台目录为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/Course.api.ts b/jeecgboot-vue3/src/views/gen/Course.api.ts similarity index 100% rename from jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/Course.api.ts rename to jeecgboot-vue3/src/views/gen/Course.api.ts diff --git a/jeecgboot-vue3/src/views/gen/Course.data.ts b/jeecgboot-vue3/src/views/gen/Course.data.ts new file mode 100644 index 00000000..0444fee8 --- /dev/null +++ b/jeecgboot-vue3/src/views/gen/Course.data.ts @@ -0,0 +1,45 @@ +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' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '课程名', + field: 'name', + component: 'Input', + }, + // TODO 主键隐藏字段,目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + name: {title: '课程名',order: 0,view: 'text', type: 'string',}, +}; + +/** +* 流程表单调用这个方法获取formSchema +* @param param +*/ +export function getBpmFormSchema(_formData): FormSchema[]{ + // 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema + return formSchema; +} \ No newline at end of file diff --git a/jeecgboot-vue3/src/views/learn/CourseList.vue b/jeecgboot-vue3/src/views/gen/CourseList.vue similarity index 97% rename from jeecgboot-vue3/src/views/learn/CourseList.vue rename to jeecgboot-vue3/src/views/gen/CourseList.vue index d3103737..3fb402c8 100644 --- a/jeecgboot-vue3/src/views/learn/CourseList.vue +++ b/jeecgboot-vue3/src/views/gen/CourseList.vue @@ -30,10 +30,6 @@ diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/components/CourseForm.vue b/jeecgboot-vue3/src/views/gen/components/CourseForm.vue similarity index 100% rename from jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/components/CourseForm.vue rename to jeecgboot-vue3/src/views/gen/components/CourseForm.vue diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/components/CourseModal.vue b/jeecgboot-vue3/src/views/gen/components/CourseModal.vue similarity index 100% rename from jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/components/CourseModal.vue rename to jeecgboot-vue3/src/views/gen/components/CourseModal.vue diff --git a/jeecgboot-vue3/src/views/learn/Course.api.ts b/jeecgboot-vue3/src/views/learn/Course.api.ts deleted file mode 100644 index fa5a4898..00000000 --- a/jeecgboot-vue3/src/views/learn/Course.api.ts +++ /dev/null @@ -1,64 +0,0 @@ -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/jeecgboot-vue3/src/views/learn/Course.data.ts b/jeecgboot-vue3/src/views/learn/Course.data.ts deleted file mode 100644 index 213d7b7d..00000000 --- a/jeecgboot-vue3/src/views/learn/Course.data.ts +++ /dev/null @@ -1,105 +0,0 @@ -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/jeecgboot-vue3/src/views/learn/components/CourseForm.vue b/jeecgboot-vue3/src/views/learn/components/CourseForm.vue deleted file mode 100644 index 9fc0480a..00000000 --- a/jeecgboot-vue3/src/views/learn/components/CourseForm.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - \ No newline at end of file diff --git a/jeecgboot-vue3/src/views/learn/components/CourseModal.vue b/jeecgboot-vue3/src/views/learn/components/CourseModal.vue deleted file mode 100644 index 7affc85c..00000000 --- a/jeecgboot-vue3/src/views/learn/components/CourseModal.vue +++ /dev/null @@ -1,99 +0,0 @@ - - - - - \ No newline at end of file