From fc557fda5e7c9fb4202c99cd955313cefe7af063 Mon Sep 17 00:00:00 2001 From: 13405411873 <1994398261@qq.com> Date: Mon, 16 Sep 2024 22:47:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/controller/HitRegInfoController.java | 2 +- .../HitRegistrationTeachInfoController.java | 1 - .../HitCompetitionStudentInfoServiceImpl.java | 4 +- .../service/impl/HitRegInfoServiceImpl.java | 2 + .../HitRegistrationTeachInfoServiceImpl.java | 6 +-- .../src/main/resources/application-druid.yml | 12 ++--- .../src/main/resources/application.yml | 4 +- .../main/resources/config/ueditor/config.json | 10 ++--- .../cms/HitRegistrationTeachInfoMapper.xml | 4 +- .../target/classes/application-druid.yml | 12 ++--- .../resources/mapper/system/SysUserMapper.xml | 44 +++++++++---------- ruoyi-ui/.env.production | 2 +- .../hit/registrationStudentInfo/index.vue | 10 ++--- ruoyi-ui/src/views/hit/teacherInfo/index.vue | 28 ++++++++++++ 14 files changed, 86 insertions(+), 55 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java index a258799..4582bc0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java @@ -43,7 +43,7 @@ public class HitRegInfoController extends BaseController @GetMapping("/list") public TableDataInfo list(HitRegInfo hitRegInfo) { - startPage(); + List list = hitRegInfoService.selectHitRegInfoList(hitRegInfo); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegistrationTeachInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegistrationTeachInfoController.java index 9e1808c..a050a2f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegistrationTeachInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegistrationTeachInfoController.java @@ -34,7 +34,6 @@ public class HitRegistrationTeachInfoController extends BaseController @GetMapping("/list") public TableDataInfo list(HitRegistrationTeachInfo hitRegistrationTeachInfo) { - startPage(); List list = hitRegistrationTeachInfoService.selectHitRegistrationTeachInfoList(hitRegistrationTeachInfo); return getDataTable(list); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java index 12ba0dc..8ba1a8f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java @@ -18,6 +18,7 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.mapper.SysUserMapper; @@ -88,9 +89,10 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl hitRegInfos = hitRegInfoMapper.selectHitRegInfoList(hitRegInfo); for (HitRegInfo regInfo : hitRegInfos) { HitRegInfoUser hitRegInfoUser =new HitRegInfoUser(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java index e1a4522..29b3094 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java @@ -16,10 +16,7 @@ import com.ruoyi.common.core.domain.model.RegisterBody; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.exception.user.CaptchaException; import com.ruoyi.common.exception.user.CaptchaExpireException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.*; import com.ruoyi.framework.manager.AsyncManager; import com.ruoyi.framework.manager.factory.AsyncFactory; import com.ruoyi.framework.web.service.SysRegisterService; @@ -93,6 +90,7 @@ public class HitRegistrationTeachInfoServiceImpl implements IHitRegistrationTeac if(ObjectUtils.isNotEmpty(hitRegistrationTeachInfo1)){ hitRegistrationTeachInfo.setSchoolName(hitRegistrationTeachInfo1.getSchoolName()); } + PageUtils.startPage(); return hitRegistrationTeachInfoMapper.selectHitRegistrationTeachInfoList(hitRegistrationTeachInfo); } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 1dfff41..a1c6cad 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,12 +6,12 @@ spring: druid: # 主库数据源 master: -# url: jdbc:mysql://61.156.90.46:3360/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true - url: jdbc:mysql://localhost:3306/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true -# username: obrhgd - username: root -# password: Obr7890&*() - password: 123456 + url: jdbc:mysql://61.156.90.46:3360/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true + # url: jdbc:mysql://localhost:3306/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true + username: obrhgd + # username: root + password: Obr7890&*() + # password: 123456 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 6649b08..c9a396d 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 8080 + port: 8081 servlet: # 应用的访问路径 context-path: /hgdWebsite @@ -74,7 +74,7 @@ spring: # 数据库索引 database: 9 # 密码 - password: 123456 + password: Obr1234!@#$ # password: # 连接超时时间 timeout: 10s diff --git a/ruoyi-admin/src/main/resources/config/ueditor/config.json b/ruoyi-admin/src/main/resources/config/ueditor/config.json index c010e0c..9c31087 100644 --- a/ruoyi-admin/src/main/resources/config/ueditor/config.json +++ b/ruoyi-admin/src/main/resources/config/ueditor/config.json @@ -7,7 +7,7 @@ "imageCompressEnable": true, /* 是否压缩图片,默认是true */ "imageCompressBorder": 1600, /* 图片压缩最长边限制 */ "imageInsertAlign": "none", /* 插入的图片浮动方式 */ - "imageUrlPrefix": "http://192.168.31.25:8080", /* 图片访问路径前缀 */ + "imageUrlPrefix": "https://meevexp.oberyun.com/hgdWebsite", /* 图片访问路径前缀 */ "imagePathFormat": "image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */ /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */ /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */ @@ -43,27 +43,27 @@ "videoActionName": "uploadvideo", /* 执行上传视频的action名称 */ "videoFieldName": "upfile", /* 提交的视频表单名称 */ "videoPathFormat": "video/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */ - "videoUrlPrefix": "http://192.168.31.25:8080", /* 视频访问路径前缀 */ + "videoUrlPrefix": "https://meevexp.oberyun.com/hgdWebsite", /* 视频访问路径前缀 */ "videoMaxSize": 102400000, /* 上传大小限制，单位B，默认100MB */ "videoAllowFiles": [ ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg", ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid"], /* 上传视频格式显示 */ /* 上传文件配置 */ "fileActionName": "uploadfile", /* controller里,执行上传视频的action名称 */ "fileFieldName": "upfile", /* 提交的文件表单名称 */ "filePathFormat": "file/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */ - "fileUrlPrefix": "http://192.168.31.25:8080", /* 文件访问路径前缀 */ + "fileUrlPrefix": "https://meevexp.oberyun.com/hgdWebsite", /* 文件访问路径前缀 */ "fileMaxSize": 51200000, /* 上传大小限制，单位B，默认50MB */ "fileAllowFiles": [ ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg", ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid", ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso", ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml" ], /* 上传文件格式显示 */ /* 列出指定目录下的图片 */ "imageManagerActionName": "listimage", /* 执行图片管理的action名称 */ "imageManagerListPath": "image/", /* 指定要列出图片的目录 */ "imageManagerListSize": 20, /* 每次列出文件数量 */ - "imageManagerUrlPrefix": "http://192.168.31.25:8080", /* 图片访问路径前缀 */ + "imageManagerUrlPrefix": "https://meevexp.oberyun.com/hgdWebsite", /* 图片访问路径前缀 */ "imageManagerInsertAlign": "none", /* 插入的图片浮动方式 */ "imageManagerAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 列出的文件类型 */ /* 列出指定目录下的文件 */ "fileManagerActionName": "listfile", /* 执行文件管理的action名称 */ "fileManagerListPath": "file/", /* 指定要列出文件的目录 */ - "fileManagerUrlPrefix": "http://192.168.31.25:8080", /* 文件访问路径前缀 */ + "fileManagerUrlPrefix": "https://meevexp.oberyun.com/hgdWebsite", /* 文件访问路径前缀 */ "fileManagerListSize": 20, /* 每次列出文件数量 */ "fileManagerAllowFiles": [ ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg", ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid", ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso", ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml" ] /* 列出的文件类型 */ } diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml index 080776d..22f6c8c 100644 --- a/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml @@ -43,8 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and type = #{type} and status = #{status} and create_time like concat(#{year},'%') + and division = #{division} - order by create_time desc + order by teacher_school, create_time desc diff --git a/ruoyi-admin/target/classes/application-druid.yml b/ruoyi-admin/target/classes/application-druid.yml index 1dfff41..a1c6cad 100644 --- a/ruoyi-admin/target/classes/application-druid.yml +++ b/ruoyi-admin/target/classes/application-druid.yml @@ -6,12 +6,12 @@ spring: druid: # 主库数据源 master: -# url: jdbc:mysql://61.156.90.46:3360/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true - url: jdbc:mysql://localhost:3306/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true -# username: obrhgd - username: root -# password: Obr7890&*() - password: 123456 + url: jdbc:mysql://61.156.90.46:3360/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true + # url: jdbc:mysql://localhost:3306/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true + username: obrhgd + # username: root + password: Obr7890&*() + # password: 123456 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 7dbdb33..385f3a0 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -45,9 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u @@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id - + - + - + - + - + - + - + - + @@ -201,28 +201,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where user_id = #{userId} - + update sys_user set status = #{status} where user_id = #{userId} - + update sys_user set avatar = #{avatar} where user_name = #{userName} - + update sys_user set password = #{password} where user_name = #{userName} - + - update sys_user set del_flag = '2' where user_id = #{userId} + delete from sys_user where user_id = #{userId} - + - update sys_user set del_flag = '2' where user_id in + delete from sys_user where user_id in #{userId} - + - - \ No newline at end of file + + diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production index 3209854..abfdab0 100644 --- a/ruoyi-ui/.env.production +++ b/ruoyi-ui/.env.production @@ -5,4 +5,4 @@ VUE_APP_TITLE = 虚拟仿真实验教学中心 ENV = 'production' # 若依管理系统/生产环境 -VUE_APP_BASE_API = 'http://122.51.230.86:8001' +VUE_APP_BASE_API = 'https://meevexp.oberyun.com/hgdWebsite' diff --git a/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue b/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue index 9715c7a..9efe8d5 100644 --- a/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue +++ b/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue @@ -47,11 +47,11 @@ v-hasPermi="['hit:hitRegistrationStudentInfo:export']" >导出 --> - - - - + + + + + diff --git a/ruoyi-ui/src/views/hit/teacherInfo/index.vue b/ruoyi-ui/src/views/hit/teacherInfo/index.vue index f7b4184..6a61030 100644 --- a/ruoyi-ui/src/views/hit/teacherInfo/index.vue +++ b/ruoyi-ui/src/views/hit/teacherInfo/index.vue @@ -9,6 +9,33 @@ @keyup.enter.native="handleQuery" /> + + + + + + + + + + + + + + + + +