From 865d3f8f22ac347e3424a676658ed40a8caedbab Mon Sep 17 00:00:00 2001
From: GoCo <guochen0829@163.com>
Date: Fri, 8 Aug 2025 20:12:01 +0800
Subject: [PATCH] tmp

---
 .../controller/CourseBusinessController.java  |   4 +-
 .../src/main/resources/application-dev.yml    |   5 +-
 jeecgboot-vue3/src/views/gen/Course.api.ts    |  64 -----
 jeecgboot-vue3/src/views/gen/Course.data.ts   |  45 ----
 jeecgboot-vue3/src/views/gen/CourseList.vue   | 231 ------------------
 .../src/views/gen/components/CourseForm.vue   |  70 ------
 .../src/views/gen/components/CourseModal.vue  |  99 --------
 7 files changed, 4 insertions(+), 514 deletions(-)
 delete mode 100644 jeecgboot-vue3/src/views/gen/Course.api.ts
 delete mode 100644 jeecgboot-vue3/src/views/gen/Course.data.ts
 delete mode 100644 jeecgboot-vue3/src/views/gen/CourseList.vue
 delete mode 100644 jeecgboot-vue3/src/views/gen/components/CourseForm.vue
 delete mode 100644 jeecgboot-vue3/src/views/gen/components/CourseModal.vue

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 d840e200..af3b9a7a 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
@@ -10,8 +10,6 @@ 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;
@@ -25,7 +23,7 @@ import javax.servlet.http.HttpServletResponse;
 @RestController
 @RequestMapping("/business/course")
 @Slf4j
-public class CourseBusinessController extends JeecgController<Course, ICourseService> {
+public class CourseBusinessController {
 
     @GetMapping("/test")
     @Operation(summary="测试")
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
index 7dc1e42b..753f7a27 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
@@ -151,9 +151,10 @@ spring:
           slow-sql-millis: 5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:33061/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#          url: jdbc:mysql://127.0.0.1:33061/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://110.42.96.65:55616/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: 123456
+          password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
diff --git a/jeecgboot-vue3/src/views/gen/Course.api.ts b/jeecgboot-vue3/src/views/gen/Course.api.ts
deleted file mode 100644
index fa5a4898..00000000
--- a/jeecgboot-vue3/src/views/gen/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/gen/Course.data.ts b/jeecgboot-vue3/src/views/gen/Course.data.ts
deleted file mode 100644
index 0444fee8..00000000
--- a/jeecgboot-vue3/src/views/gen/Course.data.ts
+++ /dev/null
@@ -1,45 +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'
-   },
-];
-//查询数据
-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/gen/CourseList.vue b/jeecgboot-vue3/src/views/gen/CourseList.vue
deleted file mode 100644
index 1eaf67c2..00000000
--- a/jeecgboot-vue3/src/views/gen/CourseList.vue
+++ /dev/null
@@ -1,231 +0,0 @@
-<template>
-  <div>
-    <!--引用表格-->
-   <BasicTable @register="registerTable" :rowSelection="rowSelection">
-     <!--插槽:table标题-->
-      <template #tableTitle>
-          <a-button type="primary" v-auth="'gen:course:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" v-auth="'gen:course:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button type="primary" v-auth="'gen:course:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-
-          <a-dropdown v-if="selectedRowKeys.length > 0">
-              <template #overlay>
-                <a-menu>
-                  <a-menu-item key="1" @click="batchHandleDelete">
-                    <Icon icon="ant-design:delete-outlined"></Icon>
-                    删除
-                  </a-menu-item>
-                </a-menu>
-              </template>
-              <a-button v-auth="'gen:course:deleteBatch'">批量操作
-                <Icon icon="mdi:chevron-down"></Icon>
-              </a-button>
-        </a-dropdown>
-        <!-- 高级查询 -->
-        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
-      </template>
-       <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
-      </template>
-      <!--字段回显插槽-->
-      <template v-slot:bodyCell="{ column, record, index, text }">
-        <template v-if="column.dataIndex==='video'">
-          <!--文件字段回显插槽-->
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
-        </template>
-        <template v-if="column.dataIndex==='question'">
-          <!--富文本件字段回显插槽-->
-          <div v-html="text"></div>
-        </template>
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <CourseModal @register="registerModal" @success="handleSuccess"></CourseModal>
-  </div>
-</template>
-
-<script lang="ts" name="gen-course" setup>
-  import {ref, reactive, computed, unref} from 'vue';
-  import {BasicTable, useTable, TableAction} from '/@/components/Table';
-  import {useModal} from '/@/components/Modal';
-  import { useListPage } from '/@/hooks/system/useListPage'
-  import CourseModal from './components/CourseModal.vue'
-  import {columns, searchFormSchema, superQuerySchema} from './Course.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './Course.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
-  import { useUserStore } from '/@/store/modules/user';
-  import { useMessage } from '/@/hooks/web/useMessage';
- import {getPopDictByCode} from "@/utils/dict";
- import {filterMultiDictText} from "@/utils/dict/JDictSelectUtil";
-  import { getDateByPicker } from '/@/utils';
-  //日期个性化选择
-  const fieldPickers = reactive({
-  });
-  const queryParam = reactive<any>({});
-  const checkedKeys = ref<Array<string | number>>([]);
-  const userStore = useUserStore();
-  const { createMessage } = useMessage();
-  //注册model
-  const [registerModal, {openModal}] = useModal();
-  //注册table数据
-  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-      tableProps:{
-           title: '课程表',
-           api: list,
-           columns,
-           canResize:true,
-           formConfig: {
-              //labelWidth: 120,
-              schemas: searchFormSchema,
-              autoSubmitOnEnter:true,
-              showAdvancedButton:true,
-              fieldMapToNumber: [
-              ],
-              fieldMapToTime: [
-              ],
-            },
-           actionColumn: {
-               width: 120,
-               fixed:'right'
-            },
-            beforeFetch: (params) => {
-              if (params && fieldPickers) {
-                for (let key in fieldPickers) {
-                  if (params[key]) {
-                    params[key] = getDateByPicker(params[key], fieldPickers[key]);
-                  }
-                }
-              }
-              return Object.assign(params, queryParam);
-            },
-            afterFetch: afterFetch
-      },
-       exportConfig: {
-            name:"课程表",
-            url: getExportUrl,
-            params: queryParam,
-          },
-          importConfig: {
-            url: getImportUrl,
-            success: handleSuccess
-          },
-  })
-
-  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
-
-  // 高级查询配置
-  const superQueryConfig = reactive(superQuerySchema);
-
-  /**
-   * 高级查询事件
-   */
-  function handleSuperQuery(params) {
-    Object.keys(params).map((k) => {
-      queryParam[k] = params[k];
-    });
-    reload();
-  }
-   /**
-    * 新增事件
-    */
-  function handleAdd() {
-     openModal(true, {
-       isUpdate: false,
-       showFooter: true,
-     });
-  }
-   /**
-    * 编辑事件
-    */
-  function handleEdit(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: true,
-     });
-   }
-   /**
-    * 详情
-   */
-  function handleDetail(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: false,
-     });
-   }
-   /**
-    * 删除事件
-    */
-  async function handleDelete(record) {
-     await deleteOne({id: record.id}, handleSuccess);
-   }
-   /**
-    * 批量删除事件
-    */
-  async function batchHandleDelete() {
-     await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
-   }
-   /**
-    * 成功回调
-    */
-  function handleSuccess() {
-      (selectedRowKeys.value = []) && reload();
-   }
-   /**
-      * 操作栏
-      */
-  function getTableAction(record){
-       return [
-         {
-           label: '编辑',
-           onClick: handleEdit.bind(null, record),
-           auth: 'gen:course:edit'
-         }
-       ]
-   }
-     /**
-        * 下拉操作栏
-        */
-  function getDropDownAction(record){
-       return [
-         {
-           label: '详情',
-           onClick: handleDetail.bind(null, record),
-         }, {
-           label: '删除',
-           popConfirm: {
-             title: '是否确认删除',
-             confirm: handleDelete.bind(null, record),
-             placement: 'topLeft',
-           },
-           auth: 'gen:course:delete'
-         }
-       ]
-   }
-
-
-
-
-   /**
-    * 翻译Popup字典配置
-   */
-    async function afterFetch(records){
-      const statusKeys = [...new Set(records.map((item) => item['status']).flatMap((item) => item && item.split(',')))];
-      if(statusKeys && statusKeys.length){
-       const dictOptions = await getPopDictByCode(statusKeys.join(','), ',status,');
-       records.forEach((item) => {
-         item['status_dictText'] = filterMultiDictText(dictOptions, item['status']);
-       });
-      }
-     return records;
-   }
-</script>
-
-<style lang="less" scoped>
-  :deep(.ant-picker),:deep(.ant-input-number){
-    width: 100%;
-  }
-</style>
\ No newline at end of file
diff --git a/jeecgboot-vue3/src/views/gen/components/CourseForm.vue b/jeecgboot-vue3/src/views/gen/components/CourseForm.vue
deleted file mode 100644
index 9fc0480a..00000000
--- a/jeecgboot-vue3/src/views/gen/components/CourseForm.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<template>
-    <div style="min-height: 400px">
-        <BasicForm @register="registerForm"></BasicForm>
-        <div style="width: 100%;text-align: center" v-if="!formDisabled">
-            <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
-        </div>
-    </div>
-</template>
-
-<script lang="ts">
-    import {BasicForm, useForm} from '/@/components/Form/index';
-    import {computed, defineComponent} from 'vue';
-    import {defHttp} from '/@/utils/http/axios';
-    import { propTypes } from '/@/utils/propTypes';
-    import {getBpmFormSchema} from '../Course.data';
-    import {saveOrUpdate} from '../Course.api';
-    
-    export default defineComponent({
-        name: "CourseForm",
-        components:{
-            BasicForm
-        },
-        props:{
-            formData: propTypes.object.def({}),
-            formBpm: propTypes.bool.def(true),
-        },
-        setup(props){
-            const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
-                labelWidth: 150,
-                schemas: getBpmFormSchema(props.formData),
-                showActionButtonGroup: false,
-                baseColProps: {span: 24}
-            });
-
-            const formDisabled = computed(()=>{
-                if(props.formData.disabled === false){
-                    return false;
-                }
-                return true;
-            });
-
-            let formData = {};
-            const queryByIdUrl = '/gen/course/queryById';
-            async function initFormData(){
-                let params = {id: props.formData.dataId};
-                const data = await defHttp.get({url: queryByIdUrl, params});
-                formData = {...data}
-                //设置表单的值
-                await setFieldsValue(formData);
-                //默认是禁用
-                await setProps({disabled: formDisabled.value})
-            }
-
-            async function submitForm() {
-                let data = getFieldsValue();
-                let params = Object.assign({}, formData, data);
-                console.log('表单数据', params)
-                await saveOrUpdate(params, true)
-            }
-
-            initFormData();
-            
-            return {
-                registerForm,
-                formDisabled,
-                submitForm,
-            }
-        }
-    });
-</script>
\ No newline at end of file
diff --git a/jeecgboot-vue3/src/views/gen/components/CourseModal.vue b/jeecgboot-vue3/src/views/gen/components/CourseModal.vue
deleted file mode 100644
index 7affc85c..00000000
--- a/jeecgboot-vue3/src/views/gen/components/CourseModal.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
-      <BasicForm @register="registerForm" name="CourseForm" />
-  </BasicModal>
-</template>
-
-<script lang="ts" setup>
-    import {ref, computed, unref, reactive} from 'vue';
-    import {BasicModal, useModalInner} from '/@/components/Modal';
-    import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../Course.data';
-    import {saveOrUpdate} from '../Course.api';
-    import { useMessage } from '/@/hooks/web/useMessage';
-    import { getDateByPicker } from '/@/utils';
-    const { createMessage } = useMessage();
-    // Emits声明
-    const emit = defineEmits(['register','success']);
-    const isUpdate = ref(true);
-    const isDetail = ref(false);
-    //表单配置
-    const [registerForm, { setProps,resetFields, setFieldsValue, validate, scrollToField }] = useForm({
-        labelWidth: 150,
-        schemas: formSchema,
-        showActionButtonGroup: false,
-        baseColProps: {span: 24}
-    });
-    //表单赋值
-    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
-        //重置表单
-        await resetFields();
-        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
-        isUpdate.value = !!data?.isUpdate;
-        isDetail.value = !!data?.showFooter;
-        if (unref(isUpdate)) {
-            //表单赋值
-            await setFieldsValue({
-                ...data.record,
-            });
-        }
-        // 隐藏底部时禁用整个表单
-       setProps({ disabled: !data?.showFooter })
-    });
-    //日期个性化选择
-    const fieldPickers = reactive({
-    });
-    //设置标题
-    const title = computed(() => (!unref(isUpdate) ? '新增' : !unref(isDetail) ? '详情' : '编辑'));
-    //表单提交事件
-    async function handleSubmit(v) {
-        try {
-            let values = await validate();
-            // 预处理日期数据
-            changeDateValue(values);
-            setModalProps({confirmLoading: true});
-            //提交表单
-            await saveOrUpdate(values, isUpdate.value);
-            //关闭弹窗
-            closeModal();
-            //刷新列表
-            emit('success');
-        } catch ({ errorFields }) {
-           if (errorFields) {
-             const firstField = errorFields[0];
-             if (firstField) {
-               scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
-             }
-           }
-           return Promise.reject(errorFields);
-        } finally {
-            setModalProps({confirmLoading: false});
-        }
-    }
-
-    /**
-     * 处理日期值
-     * @param formData 表单数据
-     */
-    const changeDateValue = (formData) => {
-        if (formData && fieldPickers) {
-            for (let key in fieldPickers) {
-                if (formData[key]) {
-                    formData[key] = getDateByPicker(formData[key], fieldPickers[key]);
-                }
-            }
-        }
-    };
-
-</script>
-
-<style lang="less" scoped>
-	/** 时间和数字输入框样式 */
-  :deep(.ant-input-number) {
-    width: 100%;
-  }
-
-  :deep(.ant-calendar-picker) {
-    width: 100%;
-  }
-</style>
\ No newline at end of file