From bc835f7b8d4ab951999ff7a08bf62d18daa0461e Mon Sep 17 00:00:00 2001 From: EricsHu <hrr145632> Date: 星期日, 25 六月 2023 16:59:36 +0800 Subject: [PATCH] 关闭定时器 --- src/main/java/com/qxueyou/scc/controller/UserController.java | 8 ++-- src/main/java/com/qxueyou/scc/exercise/timer/ExerciseTimer.java | 3 + src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemVideoService.java | 78 +++++++++++++++++++------------------- 3 files changed, 45 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/qxueyou/scc/controller/UserController.java b/src/main/java/com/qxueyou/scc/controller/UserController.java index 5bfc4b5..10115ab 100644 --- a/src/main/java/com/qxueyou/scc/controller/UserController.java +++ b/src/main/java/com/qxueyou/scc/controller/UserController.java @@ -179,8 +179,8 @@ /** * 缁熻浜烘暟 */ -// @PostMapping(value = "countUser") -// public Result countUser() { -// return userRoleService.addRole(name,String.valueOf(roleType)); -// } + @GetMapping(value = "countUser") + public Result countUser() { + return new Result(true,"cg", CollectionUtils.newObjectMap("sex",userService.countUsersex(),"sex2",userService.countUser())); + } } diff --git a/src/main/java/com/qxueyou/scc/exercise/timer/ExerciseTimer.java b/src/main/java/com/qxueyou/scc/exercise/timer/ExerciseTimer.java index e66dfe4..701b71d 100644 --- a/src/main/java/com/qxueyou/scc/exercise/timer/ExerciseTimer.java +++ b/src/main/java/com/qxueyou/scc/exercise/timer/ExerciseTimer.java @@ -4,7 +4,8 @@ import com.qxueyou.scc.exercise.service.IExerciseExtendService; /** - * 缁冧範瀹氭椂鍣� + * 缁冧範 + * 瀹氭椂鍣� * @author zhiyong * */ diff --git a/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemVideoService.java b/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemVideoService.java index 1caa134..1171cb1 100644 --- a/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemVideoService.java +++ b/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemVideoService.java @@ -157,43 +157,43 @@ /** * 瀹氭椂鍣ㄨ浆鐮佹垚鍔熷悗 鍚屾鏇存柊ResItemVideo鐨勭姸鎬� */ - @Scheduled(cron = "0/2 * * * * ?") // 姣�2绉掓墽琛屼竴娆� - public void doTimer() { - - String mediaVideoId = cacheService.lstLeftPop(RES_VIDEO_CONVER_LST); - - if (StringUtils.isBlank(mediaVideoId)) { - return; - } - - MediaVideo mediaVideo = read(MediaVideo.class, mediaVideoId); - if (mediaVideo.getStatus() == MediaVideo.STATUS_DRAFT) { - if (mediaVideo.getType().equals("video")) { - ResItemVideo resItemVideo = findUnique( - "from ResItemVideo where deleteFlag is false and mediaVideoId = ?", - CollectionUtils.newList(mediaVideoId), ResItemVideo.class); - resItemVideo.setStatus(ResItemVideo.STATUS_DRAFT); - TraceUtils.setUpdateTrace(resItemVideo); - resItemVideo.setVideoSeconds(mediaVideo.getPlayTime()); - save(resItemVideo); - - cacheService.lstRightPush(ResService.RES_TOUPDATE_CONVER_STATUS_LST, resItemVideo.getVideoId());// 灏嗚浆鐮佸畬鎴愬悗鐨勬枃浠秈d鏀惧叆缂撳瓨銆� - return; - } else if (mediaVideo.getType().equals("audio")) { - ResItemAudio resItemAudio = findUnique( - "from ResItemAudio where deleteFlag is false and mediaVideoId = ?", - CollectionUtils.newList(mediaVideoId), ResItemAudio.class); - resItemAudio.setStatus(ResItemVideo.STATUS_DRAFT); - TraceUtils.setUpdateTrace(resItemAudio); - resItemAudio.setSeconds(mediaVideo.getPlayTime()); - save(resItemAudio); - - cacheService.lstRightPush(ResService.RES_TOUPDATE_CONVER_STATUS_LST, resItemAudio.getAudioId());// 灏嗚浆鐮佸畬鎴愬悗鐨勬枃浠秈d鏀惧叆缂撳瓨銆� - return; - } - - } - cacheService.lstRightPush(RES_VIDEO_CONVER_LST, mediaVideoId); - - } +// @Scheduled(cron = "0/2 * * * * ?") // 姣�2绉掓墽琛屼竴娆� +// public void doTimer() { +// +// String mediaVideoId = cacheService.lstLeftPop(RES_VIDEO_CONVER_LST); +// +// if (StringUtils.isBlank(mediaVideoId)) { +// return; +// } +// +// MediaVideo mediaVideo = read(MediaVideo.class, mediaVideoId); +// if (mediaVideo.getStatus() == MediaVideo.STATUS_DRAFT) { +// if (mediaVideo.getType().equals("video")) { +// ResItemVideo resItemVideo = findUnique( +// "from ResItemVideo where deleteFlag is false and mediaVideoId = ?", +// CollectionUtils.newList(mediaVideoId), ResItemVideo.class); +// resItemVideo.setStatus(ResItemVideo.STATUS_DRAFT); +// TraceUtils.setUpdateTrace(resItemVideo); +// resItemVideo.setVideoSeconds(mediaVideo.getPlayTime()); +// save(resItemVideo); +// +// cacheService.lstRightPush(ResService.RES_TOUPDATE_CONVER_STATUS_LST, resItemVideo.getVideoId());// 灏嗚浆鐮佸畬鎴愬悗鐨勬枃浠秈d鏀惧叆缂撳瓨銆� +// return; +// } else if (mediaVideo.getType().equals("audio")) { +// ResItemAudio resItemAudio = findUnique( +// "from ResItemAudio where deleteFlag is false and mediaVideoId = ?", +// CollectionUtils.newList(mediaVideoId), ResItemAudio.class); +// resItemAudio.setStatus(ResItemVideo.STATUS_DRAFT); +// TraceUtils.setUpdateTrace(resItemAudio); +// resItemAudio.setSeconds(mediaVideo.getPlayTime()); +// save(resItemAudio); +// +// cacheService.lstRightPush(ResService.RES_TOUPDATE_CONVER_STATUS_LST, resItemAudio.getAudioId());// 灏嗚浆鐮佸畬鎴愬悗鐨勬枃浠秈d鏀惧叆缂撳瓨銆� +// return; +// } +// +// } +// cacheService.lstRightPush(RES_VIDEO_CONVER_LST, mediaVideoId); +// +// } } -- Gitblit v1.8.0