From 1da190e7f267bcd3501884f3aeaac7476850fec7 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期日, 26 十一月 2023 17:53:03 +0800
Subject: [PATCH] 优化菜单查询
---
src/main/java/com/qxueyou/scc/controller/SubjectController.java | 135 ++++++++++++++++++++++++--------------------
1 files changed, 74 insertions(+), 61 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/SubjectController.java b/src/main/java/com/qxueyou/scc/controller/SubjectController.java
index b25bcab..63a1f46 100644
--- a/src/main/java/com/qxueyou/scc/controller/SubjectController.java
+++ b/src/main/java/com/qxueyou/scc/controller/SubjectController.java
@@ -1,10 +1,15 @@
package com.qxueyou.scc.controller;
+import java.text.ParseException;
+import java.util.Date;
import java.util.List;
import java.util.Map;
+import com.qxueyou.scc.base.util.DateUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -30,15 +35,17 @@
import io.swagger.annotations.ApiOperation;
/**
- * 课程管理控制器
+ * 璇剧▼绠＄悊鎺у埗鍣�
*
* @author chenjunliang
*
*/
-@Api(tags = "课程管理-教师端")
+@Api(tags = "璇剧▼绠＄悊-鏁欏笀绔�")
@RestController
@RequestMapping(value = "/teach/subject")
public class SubjectController {
+
+ private final Logger log = LogManager.getLogger(SubjectController.class);
@Autowired
ISubjectService subjectService;
@@ -49,51 +56,53 @@
@Autowired
private ITeacherService teacherService;
- /**-------------------------------------------------------------------app接口------------------------------------------------------------------------------------------**/
+ /**-------------------------------------------------------------------app鎺ュ彛------------------------------------------------------------------------------------------**/
/**
- * 课程管理列表
+ * 璇剧▼绠＄悊鍒楄〃
*
* @param keyword
- * 索搜关键字
+ * 绱㈡悳鍏抽敭瀛�
* @param limit
- * 显示几条
+ * 鏄剧ず鍑犳潯
* @param pageNum
- * 当前页码
+ * 褰撳墠椤电爜
* @param status
- * 状态
+ * 鐘舵��
*/
- @ApiOperation(value = "获取列表数据-教师端", notes = "")
+ @ApiOperation(value = "鑾峰彇鍒楄〃鏁版嵁-鏁欏笀绔�", notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(name = "status", value = "状态", required = false, paramType="query", dataType = "String"),
- @ApiImplicitParam(name = "type", value = "类型(1:班级课程,3:公开课程)", required = false, paramType="query", dataType = "Integer")
+ @ApiImplicitParam(name = "status", value = "鐘舵��", required = false, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "type", value = "绫诲瀷(1:鐝骇璇剧▼,3:鍏紑璇剧▼)", required = false, paramType="query", dataType = "Integer")
})
@GetMapping(value = "/app/teacherSubjectList")
public Result list(Pager pager, @RequestParam(defaultValue="")String keyword, String status, Integer type) {
if(type == null) {
- return new Result(false, "参数错误");
+ return new Result(false, "鍙傛暟閿欒");
}
return subjectService.teacherSubjectList(pager, keyword, status, type);
}
- /**-------------------------------------------------------------------后端接口------------------------------------------------------------------------------------------**/
+ /**-------------------------------------------------------------------鍚庣鎺ュ彛------------------------------------------------------------------------------------------**/
/**
- * 课程管理列表
+ * 璇剧▼绠＄悊鍒楄〃
*
* @param keyword
- * 索搜关键字
+ * 绱㈡悳鍏抽敭瀛�
* @param limit
- * 显示几条
+ * 鏄剧ず鍑犳潯
* @param pageNum
- * 当前页码
+ * 褰撳墠椤电爜
* @param status
- * 状态
+ * 鐘舵��
*/
@GetMapping(value = "/list")
public Result list(String keyword,String status,Integer type, Integer limit, Integer pageNum) {
- String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
+// String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
+ //鍒ゆ柇鏄惁鏄暀甯�
+ String teacherId = ClientUtils.isAdmin() ? null : teacherService.getTeacherIdByUserId(ClientUtils.getUserId());
List<Subject> lst = subjectService.list(keyword, teacherId, status, type, limit, pageNum);
@@ -101,23 +110,23 @@
return new Result(true, "success", CollectionUtils.newObjectMap("subjectLst",
QBeanUtils.listBean2ListMap(lst,
- CollectionUtils.newStringMap("name", "subjectName", "subjectId", "subjectId","type","type", "status",
+ CollectionUtils.newStringMap("name", "subjectName", "subjectId", "subjectId","type","type","startTime","startTime","endTime","endTime", "status",
"status", "updateTime", "updateTime", "lectureCount", "lectureCount")),
"subjectCount", count));
}
/**
- * 课程管理列表
+ * 璇剧▼绠＄悊鍒楄〃
*
* @param keyword
- * 索搜关键字
+ * 绱㈡悳鍏抽敭瀛�
* @param limit
- * 显示几条
+ * 鏄剧ず鍑犳潯
* @param pageNum
- * 当前页码
+ * 褰撳墠椤电爜
* @param status
- * 状态
+ * 鐘舵��
*/
@GetMapping(value = "/listAllSimple")
public Result listAllSimple() {
@@ -129,9 +138,9 @@
}
/**
- * 课程发布
+ * 璇剧▼鍙戝竷
* a
- * @param 课程ids
+ * @param 璇剧▼ids
*/
@GetMapping(value = "/release")
public Result release(String subjectIds) {
@@ -141,10 +150,10 @@
}
/**
- * 课程下架
+ * 璇剧▼涓嬫灦
*
* @param subjectIds
- * 课程ids
+ * 璇剧▼ids
*/
@GetMapping(value = "/soldOut")
public Result soldOut(String subjectIds) {
@@ -152,10 +161,10 @@
}
/**
- * 课程删除
+ * 璇剧▼鍒犻櫎
*
* @param subjectIds
- * 课程ids
+ * 璇剧▼ids
*/
@GetMapping(value = "/delete")
public Result delete(String subjectIds) {
@@ -163,35 +172,35 @@
}
/**
- * 复制课程
+ * 澶嶅埗璇剧▼
*
* @param subjectId
- * 课程id
+ * 璇剧▼id
* @param subjectName
- * 课程名称
+ * 璇剧▼鍚嶇О
* @param imgPath
- * 图片url
+ * 鍥剧墖url
* @param content
- * 课程介绍
+ * 璇剧▼浠嬬粛
*/
@PostMapping(value = "/copy")
- public Result copy(String subjectId, String subjectName, String imgPath, String content,int type) {
- return add(subjectName, imgPath, content,type);
+ public Result copy(String subjectId, String subjectName, String imgPath, String content,int type,String startTime,String endTime) {
+ return add(subjectName, imgPath, content,type,startTime,endTime);
}
/**
- * 新增课程
+ * 鏂板璇剧▼
*
* @param subjectName
- * 课程名称
+ * 璇剧▼鍚嶇О
* @param imgPath
- * 图片url
+ * 鍥剧墖url
* @param content
- * 课程介绍
+ * 璇剧▼浠嬬粛
* @return
*/
@PostMapping(value = "/add")
- public Result add(String subjectName, String imgPath, String content,int type) {
+ public Result add(String subjectName, String imgPath, String content, int type, String startTime, String endTime) {
String contentFileId = null;
if(StringUtils.isNotEmpty(content)){
@@ -204,21 +213,25 @@
if (StringUtils.isNotBlank(imgPath)) {
coverPageFileId = fileService.readIdByPath(imgPath);
}
-
- return subjectService.add(subjectName, coverPageFileId,contentFileId,type);
+ try {
+ return subjectService.add(subjectName, coverPageFileId,contentFileId,type, DateUtils.convertStringToDate(startTime),DateUtils.convertStringToDate(endTime));
+ }catch (ParseException e) {
+ log.error(e, e);
+ return new Result(false, "鏃ユ湡鍙傛暟閿欒");
+ }
}
/**
- * 新增练习
+ * 鏂板缁冧範
*
* @param name
- * 题目名称
+ * 棰樼洰鍚嶇О
* @param type
- * 题库类型
+ * 棰樺簱绫诲瀷
* @param difficulty
- * 难度系数
+ * 闅惧害绯绘暟
* @param repeatFlag
- * 是否重复
+ * 鏄惁閲嶅
* @return
*/
@PostMapping(value = "addExercise")
@@ -227,16 +240,16 @@
}
/**
- * 更新课程
+ * 鏇存柊璇剧▼
*
* @param subjectId
- * 课程id
+ * 璇剧▼id
* @param subjectName
- * 课程名称
+ * 璇剧▼鍚嶇О
* @param imgPath
- * 图片url
+ * 鍥剧墖url
* @param content
- * 课程介绍
+ * 璇剧▼浠嬬粛
*/
@PostMapping(value = "/update")
public Result update(String subjectId, String subjectName, String imgPath, String content,int type) {
@@ -256,14 +269,14 @@
}
/**
- * 更新课程获取课程内容
+ * 鏇存柊璇剧▼鑾峰彇璇剧▼鍐呭
*
* @param subjectId
- * 课程id
+ * 璇剧▼id
*/
- @ApiOperation(value = "获取课程详情-教师端", notes = "")
+ @ApiOperation(value = "鑾峰彇璇剧▼璇︽儏-鏁欏笀绔�", notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(name = "subjectId", value = "课程id", required = false, paramType="query", dataType = "String")
+ @ApiImplicitParam(name = "subjectId", value = "璇剧▼id", required = false, paramType="query", dataType = "String")
})
@GetMapping(value = "getSubjectDetail")
public Result getSubjectDetail(String subjectId) {
@@ -288,14 +301,14 @@
/**
- * 获取可用课程下拉列表接口
+ * 鑾峰彇鍙敤璇剧▼涓嬫媺鍒楄〃鎺ュ彛
*
* @param examId
* @return
*/
@RequestMapping(value = "/selectlist", method = RequestMethod.GET)
public @ResponseBody List<Map<String,Object>> subjectList(Integer subjectType) {
- //判断是否是教师
+ //鍒ゆ柇鏄惁鏄暀甯�
String teacherId = ClientUtils.isAdmin() ? null : teacherService.getTeacherIdByUserId(ClientUtils.getUserId());
if(subjectType==null){
--
Gitblit v1.8.0