From b502559b6e490baca80df764b20a125f7eeb2db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com> Date: Fri, 6 Sep 2024 18:02:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=A4=A7=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BC=9A=E8=AE=AE=E4=B8=AD=E6=8F=90=E5=87=BA=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HitCompetitionStudentInfoController.java | 35 ++++- .../java/com/ruoyi/cms/domain/BaseInfo.java | 4 + .../HitCompetitionStudentInfoMapper.java | 6 + .../HitRegistrationTeachInfoServiceImpl.java | 12 +- .../src/main/resources/application-druid.yml | 9 +- .../src/main/resources/application.yml | 4 +- .../resources/mapper/cms/BaseInfoMapper.xml | 2 +- .../cms/HitCompetitionStudentInfoMapper.xml | 14 ++ .../target/classes/application-druid.yml | 19 ++- ruoyi-admin/target/classes/application.yml | 8 +- ruoyi-quartz/pom.xml | 6 + .../java/com/ruoyi/quartz/task/HitTask.java | 20 +++ ruoyi-ui/.env.development | 4 +- ruoyi-ui/src/api/hit/stuInfo.js | 8 + ruoyi-ui/src/views/cms/baseInfo/index.vue | 5 +- ruoyi-ui/src/views/hit/stuInfo/index.vue | 137 +++++++++--------- .../officialWebsite/Components/footer.vue | 28 ++-- .../officialWebsite/Components/header.vue | 20 ++- .../src/views/officialWebsite/competition.vue | 24 +-- ruoyi-ui/vue.config.js | 2 +- 20 files changed, 246 insertions(+), 121 deletions(-) create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/HitTask.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitCompetitionStudentInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitCompetitionStudentInfoController.java index 295832f..26fa8a6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitCompetitionStudentInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitCompetitionStudentInfoController.java @@ -7,13 +7,17 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.exception.job.TaskException; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.SysRegisterService; +//import com.ruoyi.cms.task.HitTask; +import com.ruoyi.quartz.controller.SysJobController; +import com.ruoyi.quartz.domain.SysJob; +import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; import java.util.List; /** @@ -30,6 +34,12 @@ public class HitCompetitionStudentInfoController extends BaseController { @Autowired private IHitCompetitionStudentInfoService hitCompetitionStudentInfoService; +// @Autowired +// private HitTask hitTask; + + @Autowired + private SysJobController sysJobController; + /** * 查询大赛学生列表 @@ -136,4 +146,25 @@ public class HitCompetitionStudentInfoController extends BaseController { public AjaxResult getTeamMateInfoByStuId(){ return AjaxResult.success(hitCompetitionStudentInfoService.selectTeamMateInfoByStuId()); } + + @Log(title = "修改个人赛时间", businessType = BusinessType.UPDATE) + @PutMapping("/updateTime") + public AjaxResult updateTime(@RequestBody LocalDateTime time) { + System.out.println("接收到的时间"+time); + SysJob job = new SysJob(); + job.setInvokeTarget("hitTask.scheduleTask"); + //将time转化为cron表达式，包含年 + job.setRemark("修改个人赛时间"); + job.setStatus("0"); + job.setJobId(4L); + job.setCronExpression("0 "+time.getSecond()+" "+time.getMinute()+" "+time.getHour()+" * * ?"); + try { + sysJobController.edit(job); + } catch (SchedulerException e) { + } catch (TaskException e) { + throw new RuntimeException(e); + } +// hitTask.scheduleTask(); + return success(time); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/BaseInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/BaseInfo.java index d3b0a43..c972498 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/BaseInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/BaseInfo.java @@ -50,4 +50,8 @@ public class BaseInfo extends BaseEntity /** 是否可以报名 */ private String registerStatus; + + /** 技术支持手机号 */ + @Excel(name = "技术支持手机号") + private String technologyNumber; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitCompetitionStudentInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitCompetitionStudentInfoMapper.java index 3ddee74..9f03eec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitCompetitionStudentInfoMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitCompetitionStudentInfoMapper.java @@ -65,4 +65,10 @@ public interface HitCompetitionStudentInfoMapper extends BaseMapper - select id, web_name, contact_number, contact_email, address, web_img, record_info, copyright_info, register_status from base_info + select id, web_name, contact_number, contact_email, address, web_img, record_info, copyright_info, register_status, technology_number from base_info diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml index 0efbc34..0fd98ae 100644 --- a/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml @@ -133,6 +133,20 @@ where id = #{id} + + UPDATE hit_competition_student_info + SET is_preliminary = 1 + WHERE school_name IN ( + SELECT school_name + FROM ( + SELECT school_name + FROM hit_competition_student_info + GROUP BY school_name + HAVING COUNT(*) < 15 + ) AS temp + ); + + delete from hit_competition_student_info where id = #{id} diff --git a/ruoyi-admin/target/classes/application-druid.yml b/ruoyi-admin/target/classes/application-druid.yml index 118b291..9bd9feb 100644 --- a/ruoyi-admin/target/classes/application-druid.yml +++ b/ruoyi-admin/target/classes/application-druid.yml @@ -6,9 +6,12 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://122.51.230.86:3306/hgd_website?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: hgdRoot - password: qqzcy@1014 +# 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 # master: # url: jdbc:mysql://localhost:3306/ry-cms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: root @@ -17,9 +20,9 @@ spring: slave: # 从数据源开关/默认关闭 enabled: false - url: - username: - password: + url: + username: + password: # 初始连接数 initialSize: 5 # 最小连接池数量 @@ -43,7 +46,7 @@ spring: testWhileIdle: true testOnBorrow: false testOnReturn: false - webStatFilter: + webStatFilter: enabled: true statViewServlet: enabled: true @@ -62,4 +65,4 @@ spring: merge-sql: true wall: config: - multi-statement-allow: true \ No newline at end of file + multi-statement-allow: true diff --git a/ruoyi-admin/target/classes/application.yml b/ruoyi-admin/target/classes/application.yml index 8d678ce..be57f0c 100644 --- a/ruoyi-admin/target/classes/application.yml +++ b/ruoyi-admin/target/classes/application.yml @@ -16,10 +16,10 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 8089 + port: 8080 servlet: # 应用的访问路径 - context-path: / + context-path: /hgdWebsite tomcat: # tomcat的URI编码 uri-encoding: UTF-8 @@ -72,9 +72,9 @@ spring: # 端口，默认为6379 port: 6379 # 数据库索引 - database: 0 + database: 9 # 密码 - password: + password: 123456 # 连接超时时间 timeout: 10s lettuce: diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml index 4e7a0ce..5d577ed 100644 --- a/ruoyi-quartz/pom.xml +++ b/ruoyi-quartz/pom.xml @@ -35,6 +35,12 @@ ruoyi-common + + + + + + \ No newline at end of file diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/HitTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/HitTask.java new file mode 100644 index 0000000..22d5bef --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/HitTask.java @@ -0,0 +1,20 @@ +//package com.ruoyi.quartz.task; +// +// +//import com.ruoyi.cms.mapper.HitCompetitionStudentInfoMapper; +//import org.springframework.stereotype.Component; +// +// +//@Component("hitTask") +//public class HitTask { +// +// private HitCompetitionStudentInfoMapper hitCompetitionStudentInfoMapper; +// +// +// public void scheduleTask() { +// // 这里是你要执行的任务 +// System.out.println("用户选定的时间到了，执行任务..."); +//// hitCompetitionStudentInfoMapper.updateStudentByLessThan(); +// +// } +//} diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index d6a27a3..2294fe4 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -4,6 +4,8 @@ VUE_APP_TITLE = 虚拟仿真实验教学中心 # 开发环境配置 ENV = 'development' # 若依管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.31.25:8080' +# VUE_APP_BASE_API = 'http://192.168.31.25:8080' +VUE_APP_BASE_API = 'http://localhost:8080/hgdWebsite' +# VUE_APP_BASE_API = '/dev-api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/ruoyi-ui/src/api/hit/stuInfo.js b/ruoyi-ui/src/api/hit/stuInfo.js index 96d9768..e51b75f 100644 --- a/ruoyi-ui/src/api/hit/stuInfo.js +++ b/ruoyi-ui/src/api/hit/stuInfo.js @@ -42,3 +42,11 @@ export function delInfo(id) { method: 'delete' }) } +// 修改个人赛时间 +export function updateTime(time) { + return request({ + url: '/system/hit_stu_info/updateTime', + data: time, + method: 'put' + }) +} diff --git a/ruoyi-ui/src/views/cms/baseInfo/index.vue b/ruoyi-ui/src/views/cms/baseInfo/index.vue index f99040f..c4c4bf8 100644 --- a/ruoyi-ui/src/views/cms/baseInfo/index.vue +++ b/ruoyi-ui/src/views/cms/baseInfo/index.vue @@ -1,7 +1,7 @@