diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 162dfc82c..36e5d07d6 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -499,7 +499,7 @@ }, // 工具栏表格树修改 editTree: function() { - var row = $('#bootstrap-table').bootstrapTreeTable('getSelections')[0]; + var row = $('#bootstrap-tree-table').bootstrapTreeTable('getSelections')[0]; if ($.common.isEmpty(row)) { $.modal.alertWarning("请至少选择一条记录"); return; diff --git a/ruoyi-admin/src/main/resources/templates/system/user/user.html b/ruoyi-admin/src/main/resources/templates/system/user/user.html index 49e0b9294..e113de877 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/user.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html @@ -43,7 +43,7 @@ 手机号码：
  • - 用户状态： diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionController.java index f7e462995..4a8257440 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionController.java @@ -4,8 +4,12 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; +import cn.hutool.json.JSONArray; +import com.ruoyi.common.json.JSONObject; import com.ruoyi.exam.domain.ExamQuestionCategory; +import com.ruoyi.exam.domain.ExamQuestionItem; import com.ruoyi.exam.service.IExamQuestionCategoryService; +import com.ruoyi.exam.service.IExamQuestionItemService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -38,6 +42,9 @@ public class ExamQuestionController extends BaseController @Autowired private IExamQuestionCategoryService examQuestionCategoryService; + + @Autowired + private IExamQuestionItemService examQuestionItemService; @RequiresPermissions("exam:examQuestion:view") @GetMapping() @@ -139,6 +146,18 @@ public class ExamQuestionController extends BaseController return toAjax(examQuestionService.insertQuestion(examQuestion,number,content)); } + + @RequiresPermissions("exam:examQuestion:edit") + @Log(title = "问题", businessType = BusinessType.INSERT) + @PostMapping("/update") + @ResponseBody + public AjaxResult update(ExamQuestion examQuestion,@RequestParam(value = "number", required = true) String[] number, + @RequestParam(value = "content", required = true) String[] content) + { + + return toAjax(examQuestionService.updateQuestion(examQuestion,number,content)); + } + /** * 修改问题 */ @@ -147,7 +166,21 @@ public class ExamQuestionController extends BaseController { ExamQuestion examQuestion = examQuestionService.selectExamQuestionById(id); mmap.put("examQuestion", examQuestion); - return prefix + "/edit"; + ExamQuestionItem examQuestionItem = new ExamQuestionItem(); + examQuestionItem.setExamQuestionId(id); + List examQuestionItems = examQuestionItemService.selectList(examQuestionItem); + JSONArray arr = new JSONArray(); + arr.addAll(examQuestionItems); + mmap.put("examQuestionItem", arr.toString()); + String s = ""; + if(examQuestion.getType().equals("1")){ + s= "/choiceUpdate"; + }else if(examQuestion.getType().equals("2")){ + s = "/morechoiceUpdate"; + }else{ + s = "/judgeUpdate"; + } + return prefix + s; } /** @@ -170,7 +203,8 @@ public class ExamQuestionController extends BaseController @PostMapping( "/remove") @ResponseBody public AjaxResult remove(String ids) - { + { + examQuestionItemService.deleteByQuestionIds(ids); return toAjax(examQuestionService.deleteExamQuestionByIds(ids)); } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionItemMapper.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionItemMapper.java index d9f931a30..4dedeb556 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionItemMapper.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionItemMapper.java @@ -60,4 +60,5 @@ public interface ExamQuestionItemMapper extends MyMapper */ public int deleteExamQuestionItemByIds(String[] ids); + void deleteByQuestionIds(String[] ids); } \ No newline at end of file diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionItemService.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionItemService.java index 23a345931..78fe22939 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionItemService.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionItemService.java @@ -26,5 +26,6 @@ public interface IExamQuestionItemService extends AbstractBaseService selectExamQuestionItemList(ExamQuestionItem examQuestionItem); - + + void deleteByQuestionIds(String ids); } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionService.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionService.java index a743aeefb..c8070081f 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionService.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionService.java @@ -52,4 +52,6 @@ public interface IExamQuestionService extends AbstractBaseService public int deleteExamQuestionByIds(String ids); int insertQuestion(ExamQuestion examQuestion, String[] number, String[] content); + + int updateQuestion(ExamQuestion examQuestion, String[] number, String[] content); } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionItemServiceImpl.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionItemServiceImpl.java index f0b445fd5..28d393709 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionItemServiceImpl.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionItemServiceImpl.java @@ -32,6 +32,13 @@ public class ExamQuestionItemServiceImpl extends AbstractBaseServiceImpl select = examQuestionMapper.selectExamQuestionList(examQuestion); + String id = select.get(0).getId(); + examQuestionItemMapper.deleteByQuestionIds(new String[]{id}); + ExamQuestionItem examQuestionItem = new ExamQuestionItem(); + for (int i1 = 0; i1 < number.length; i1++) {examQuestionItem.setContent(content[i1]); + examQuestionItem.setNumber(number[i1]); + examQuestionItem.setExamQuestionId(select.get(0).getId()+""); + examQuestionItem.setCreateDate(date); + examQuestionItem.setCreateBy(ShiroUtils.getLoginName()); + examQuestionItemMapper.insertExamQuestionItem(examQuestionItem); + + + } + + + return i ; + + } + } diff --git a/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionItemMapper.xml b/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionItemMapper.xml index c0ec90260..0584c15c0 100644 --- a/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionItemMapper.xml +++ b/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionItemMapper.xml @@ -96,5 +96,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - + + + + delete from exam_question_item where exam_question_id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-exam/src/main/resources/templates/exam/examQuestion/choiceUpdate.html b/ruoyi-exam/src/main/resources/templates/exam/examQuestion/choiceUpdate.html new file mode 100644 index 000000000..001b7e38f --- /dev/null +++ b/ruoyi-exam/src/main/resources/templates/exam/examQuestion/choiceUpdate.html @@ -0,0 +1,206 @@ + + + + + +
    +
    +
    + + + + + + +
    + +
    +
    + + + + + + + +
    + +
    + +
    +
    + +
    +
    + +
    +
    + +
    + +
    + +
    +
    + +
    +
    + +
    +
    + +
    + +
    + 添加选项 +
    +
    + + + + + + + + + +
    + +
    + +
    +
    + +
    +
    +
    + + + diff --git a/ruoyi-exam/src/main/resources/templates/exam/examQuestion/examQuestion.html b/ruoyi-exam/src/main/resources/templates/exam/examQuestion/examQuestion.html index 1afe8c19c..0300b199a 100644 --- a/ruoyi-exam/src/main/resources/templates/exam/examQuestion/examQuestion.html +++ b/ruoyi-exam/src/main/resources/templates/exam/examQuestion/examQuestion.html @@ -78,9 +78,7 @@ shiro:hasPermission="exam:examQuestion:remove"> 删除 - - 导出 - +
    @@ -93,6 +91,7 @@ + + diff --git a/ruoyi-exam/src/main/resources/templates/exam/examQuestion/morechoiceUpdate.html b/ruoyi-exam/src/main/resources/templates/exam/examQuestion/morechoiceUpdate.html new file mode 100644 index 000000000..76ae5c135 --- /dev/null +++ b/ruoyi-exam/src/main/resources/templates/exam/examQuestion/morechoiceUpdate.html @@ -0,0 +1,206 @@ + + + + + +
    +
    +
    + + + + + + +
    + +
    +
    + + + + + + + +
    + +
    + +
    +
    + +
    +
    + +
    +
    + +
    + +
    + +
    +
    + +
    +
    + +
    +
    + +
    + +
    + 添加选项 +
    +
    + + + + + + + + + +
    + +
    + +
    +
    + +
    +
    +
    + + + diff --git a/ruoyi-train/src/main/java/com/ruoyi/course/controller/TrainCourseCategoryController.java b/ruoyi-train/src/main/java/com/ruoyi/course/controller/TrainCourseCategoryController.java index c8245d18f..b873ba15d 100644 --- a/ruoyi-train/src/main/java/com/ruoyi/course/controller/TrainCourseCategoryController.java +++ b/ruoyi-train/src/main/java/com/ruoyi/course/controller/TrainCourseCategoryController.java @@ -19,13 +19,12 @@ import java.util.Map; /** * 课程分类管理 - * + * * @author ruoyi */ @Controller @RequestMapping("/train/course/category") -public class TrainCourseCategoryController extends BaseController -{ +public class TrainCourseCategoryController extends BaseController { private String prefix = "course/category"; @Autowired @@ -33,17 +32,15 @@ public class TrainCourseCategoryController extends BaseController @RequiresPermissions("train:course:category:view") @GetMapping() - public String dept() - { - return prefix + "/dept"; + public String dept() { + return prefix + "/category"; } @RequiresPermissions("train:course:category:list") @GetMapping("/list") @ResponseBody - public List list(TrainCourseCategory dept) - { - List deptList = trainCourseCategoryService.selectDeptList(dept); + public List list(TrainCourseCategory dept) { + List deptList = trainCourseCategoryService.selectDeptList( dept ); return deptList; } @@ -51,9 +48,8 @@ public class TrainCourseCategoryController extends BaseController * 新增课程分类 */ @GetMapping("/add/{parentId}") - public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) - { - mmap.put("dept", trainCourseCategoryService.selectDeptById(parentId)); + public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) { + mmap.put( "dept", trainCourseCategoryService.selectDeptById( parentId ) ); return prefix + "/add"; } @@ -64,24 +60,21 @@ public class TrainCourseCategoryController extends BaseController @RequiresPermissions("train:course:category:add") @PostMapping("/add") @ResponseBody - public AjaxResult addSave(TrainCourseCategory dept) - { - dept.setCreateBy(ShiroUtils.getLoginName()); - return toAjax(trainCourseCategoryService.insertDept(dept)); + public AjaxResult addSave(TrainCourseCategory dept) { + dept.setCreateBy( ShiroUtils.getLoginName() ); + return toAjax( trainCourseCategoryService.insertDept( dept ) ); } /** * 修改 */ - @GetMapping("/edit/{deptId}") - public String edit(@PathVariable("deptId") Long deptId, ModelMap mmap) - { - TrainCourseCategory dept = trainCourseCategoryService.selectDeptById(deptId); - if (StringUtils.isNotNull(dept) && 100L == deptId) - { - dept.setParentName("无"); + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { + TrainCourseCategory dept = trainCourseCategoryService.selectDeptById( id ); + if (StringUtils.isNotNull( dept ) && 100L == id) { + dept.setParentName( "无" ); } - mmap.put("dept", dept); + mmap.put( "dept", dept ); return prefix + "/edit"; } @@ -92,10 +85,9 @@ public class TrainCourseCategoryController extends BaseController @RequiresPermissions("train:course:category:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(TrainCourseCategory dept) - { - dept.setUpdateBy(ShiroUtils.getLoginName()); - return toAjax(trainCourseCategoryService.updateDept(dept)); + public AjaxResult editSave(TrainCourseCategory dept) { + dept.setUpdateBy( ShiroUtils.getLoginName() ); + return toAjax( trainCourseCategoryService.updateDept( dept ) ); } /** @@ -103,19 +95,16 @@ public class TrainCourseCategoryController extends BaseController */ @Log(title = "课程分类管理", businessType = BusinessType.DELETE) @RequiresPermissions("train:course:category:remove") - @PostMapping("/remove/{deptId}") + @PostMapping("/remove/{id}") @ResponseBody - public AjaxResult remove(@PathVariable("deptId") Long deptId) - { - if (trainCourseCategoryService.selectDeptCount(deptId) > 0) - { - return error(1, "存在下级课程分类,不允许删除"); + public AjaxResult remove(@PathVariable("id") Long id) { + if (trainCourseCategoryService.selectDeptCount( id ) > 0) { + return error( 1, "存在下级课程分类,不允许删除" ); } - if (trainCourseCategoryService.checkDeptExistUser(deptId)) - { - return error(1, "课程分类存在用户,不允许删除"); + if (trainCourseCategoryService.checkDeptExistUser( id )) { + return error( 1, "课程分类存在用户,不允许删除" ); } - return toAjax(trainCourseCategoryService.deleteDeptById(deptId)); + return toAjax( trainCourseCategoryService.deleteDeptById( id ) ); } /** @@ -123,18 +112,16 @@ public class TrainCourseCategoryController extends BaseController */ @PostMapping("/checkDeptNameUnique") @ResponseBody - public String checkDeptNameUnique(TrainCourseCategory dept) - { - return trainCourseCategoryService.checkDeptNameUnique(dept); + public String checkDeptNameUnique(TrainCourseCategory dept) { + return trainCourseCategoryService.checkDeptNameUnique( dept ); } /** * 选择课程分类树 */ - @GetMapping("/selectDeptTree/{deptId}") - public String selectDeptTree(@PathVariable("deptId") Long deptId, ModelMap mmap) - { - mmap.put("dept", trainCourseCategoryService.selectDeptById(deptId)); + @GetMapping("/selectDeptTree/{id}") + public String selectDeptTree(@PathVariable("id") Long id, ModelMap mmap) { + mmap.put( "dept", trainCourseCategoryService.selectDeptById( id ) ); return prefix + "/tree"; } @@ -143,8 +130,7 @@ public class TrainCourseCategoryController extends BaseController */ @GetMapping("/treeData") @ResponseBody - public List> treeData() - { + public List> treeData() { List> tree = trainCourseCategoryService.selectDeptTree(); return tree; } diff --git a/ruoyi-train/src/main/java/com/ruoyi/courseware/controller/TrainCoursewareCategoryController.java b/ruoyi-train/src/main/java/com/ruoyi/courseware/controller/TrainCoursewareCategoryController.java index 8eeb59380..9f5e384de 100644 --- a/ruoyi-train/src/main/java/com/ruoyi/courseware/controller/TrainCoursewareCategoryController.java +++ b/ruoyi-train/src/main/java/com/ruoyi/courseware/controller/TrainCoursewareCategoryController.java @@ -19,13 +19,12 @@ import java.util.Map; /** * 课件分类信息 - * + * * @author ruoyi */ @Controller @RequestMapping("/train/courseware/category") -public class TrainCoursewareCategoryController extends BaseController -{ +public class TrainCoursewareCategoryController extends BaseController { private String prefix = "courseware/category"; @Autowired @@ -33,27 +32,24 @@ public class TrainCoursewareCategoryController extends BaseController @RequiresPermissions("train:courseware:category:view") @GetMapping() - public String dept() - { - return prefix + "/dept"; + public String category() { + return prefix + "/category"; } @RequiresPermissions("train:courseware:category:list") @GetMapping("/list") @ResponseBody - public List list(TrainCoursewareCategory dept) - { - List deptList = trainCoursewareCategoryService.selectDeptList(dept); - return deptList; + public List list(TrainCoursewareCategory category) { + List categoryList = trainCoursewareCategoryService.selectCategoryList( category ); + return categoryList; } /** * 新增课件分类 */ @GetMapping("/add/{parentId}") - public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) - { - mmap.put("dept", trainCoursewareCategoryService.selectDeptById(parentId)); + public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) { + mmap.put( "category", trainCoursewareCategoryService.selectCategoryById( parentId ) ); return prefix + "/add"; } @@ -64,24 +60,21 @@ public class TrainCoursewareCategoryController extends BaseController @RequiresPermissions("train:courseware:category:add") @PostMapping("/add") @ResponseBody - public AjaxResult addSave(TrainCoursewareCategory dept) - { - dept.setCreateBy(ShiroUtils.getLoginName()); - return toAjax(trainCoursewareCategoryService.insertDept(dept)); + public AjaxResult addSave(TrainCoursewareCategory category) { + category.setCreateBy( ShiroUtils.getLoginName() ); + return toAjax( trainCoursewareCategoryService.insertCategory( category ) ); } /** * 修改 */ - @GetMapping("/edit/{deptId}") - public String edit(@PathVariable("deptId") Long deptId, ModelMap mmap) - { - TrainCoursewareCategory dept = trainCoursewareCategoryService.selectDeptById(deptId); - if (StringUtils.isNotNull(dept) && 100L == deptId) - { - dept.setParentName("无"); + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { + TrainCoursewareCategory category = trainCoursewareCategoryService.selectCategoryById( id ); + if (StringUtils.isNotNull( category ) && 100L == id) { + category.setParentName( "无" ); } - mmap.put("dept", dept); + mmap.put( "category", category ); return prefix + "/edit"; } @@ -92,10 +85,9 @@ public class TrainCoursewareCategoryController extends BaseController @RequiresPermissions("train:courseware:category:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(TrainCoursewareCategory dept) - { - dept.setUpdateBy(ShiroUtils.getLoginName()); - return toAjax(trainCoursewareCategoryService.updateDept(dept)); + public AjaxResult editSave(TrainCoursewareCategory category) { + category.setUpdateBy( ShiroUtils.getLoginName() ); + return toAjax( trainCoursewareCategoryService.updateCategory( category ) ); } /** @@ -103,38 +95,33 @@ public class TrainCoursewareCategoryController extends BaseController */ @Log(title = "课件分类管理", businessType = BusinessType.DELETE) @RequiresPermissions("train:courseware:category:remove") - @PostMapping("/remove/{deptId}") + @PostMapping("/remove/{id}") @ResponseBody - public AjaxResult remove(@PathVariable("deptId") Long deptId) - { - if (trainCoursewareCategoryService.selectDeptCount(deptId) > 0) - { - return error(1, "存在下级课件分类,不允许删除"); + public AjaxResult remove(@PathVariable("id") Long id) { + if (trainCoursewareCategoryService.selectCategoryCount( id ) > 0) { + return error( 1, "存在下级课件分类,不允许删除" ); } - if (trainCoursewareCategoryService.checkDeptExistUser(deptId)) - { - return error(1, "课件分类存在用户,不允许删除"); + if (trainCoursewareCategoryService.checkCategoryExistCourseware( id )) { + return error( 1, "课件分类存在课件,不允许删除" ); } - return toAjax(trainCoursewareCategoryService.deleteDeptById(deptId)); + return toAjax( trainCoursewareCategoryService.deleteCategoryById( id ) ); } /** * 校验课件分类名称 */ - @PostMapping("/checkDeptNameUnique") + @PostMapping("/checkCategoryNameUnique") @ResponseBody - public String checkDeptNameUnique(TrainCoursewareCategory dept) - { - return trainCoursewareCategoryService.checkDeptNameUnique(dept); + public String checkCategoryNameUnique(TrainCoursewareCategory category) { + return trainCoursewareCategoryService.checkCategoryNameUnique( category ); } /** * 选择课件分类树 */ - @GetMapping("/selectDeptTree/{deptId}") - public String selectDeptTree(@PathVariable("deptId") Long deptId, ModelMap mmap) - { - mmap.put("dept", trainCoursewareCategoryService.selectDeptById(deptId)); + @GetMapping("/selectCategoryTree/{id}") + public String selectCategoryTree(@PathVariable("id") Long id, ModelMap mmap) { + mmap.put( "category", trainCoursewareCategoryService.selectCategoryById( id ) ); return prefix + "/tree"; } @@ -143,9 +130,8 @@ public class TrainCoursewareCategoryController extends BaseController */ @GetMapping("/treeData") @ResponseBody - public List> treeData() - { - List> tree = trainCoursewareCategoryService.selectDeptTree(); + public List> treeData() { + List> tree = trainCoursewareCategoryService.selectCategoryTree(); return tree; } diff --git a/ruoyi-train/src/main/java/com/ruoyi/courseware/mapper/TrainCoursewareCategoryMapper.java b/ruoyi-train/src/main/java/com/ruoyi/courseware/mapper/TrainCoursewareCategoryMapper.java index 4e6da790b..0be68901f 100644 --- a/ruoyi-train/src/main/java/com/ruoyi/courseware/mapper/TrainCoursewareCategoryMapper.java +++ b/ruoyi-train/src/main/java/com/ruoyi/courseware/mapper/TrainCoursewareCategoryMapper.java @@ -11,86 +11,78 @@ import java.util.List; * * @author ruoyi */ -public interface TrainCoursewareCategoryMapper extends MyMapper -{ +public interface TrainCoursewareCategoryMapper extends MyMapper { /** * 查询课件分类人数 * - * @param dept 课件分类信息 + * @param category 课件分类信息 * @return 结果 */ - public int selectDeptCount(TrainCoursewareCategory dept); + public int selectCategoryCount(TrainCoursewareCategory category); /** * 查询课件分类是否存在用户 * - * @param deptId 课件分类ID + * @param id 课件分类ID * @return 结果 */ - public int checkDeptExistUser(Long deptId); + public int checkCategoryExistCourseware(Long id); /** * 查询课件分类管理数据 * - * @param dept 课件分类信息 + * @param category 课件分类信息 * @return 课件分类信息集合 */ - public List selectDeptList(TrainCoursewareCategory dept); + public List selectCategoryList(TrainCoursewareCategory category); /** * 删除课件分类管理信息 * - * @param deptId 课件分类ID + * @param id 课件分类ID * @return 结果 */ - public int deleteDeptById(Long deptId); + public int deleteCategoryById(Long id); /** * 新增课件分类信息 * - * @param dept 课件分类信息 + * @param category 课件分类信息 * @return 结果 */ - public int insertDept(TrainCoursewareCategory dept); + public int insertCategory(TrainCoursewareCategory category); /** * 修改课件分类信息 * - * @param dept 课件分类信息 + * @param category 课件分类信息 * @return 结果 */ - public int updateDept(TrainCoursewareCategory dept); + public int updateCategory(TrainCoursewareCategory category); /** * 修改子元素关系 * - * @param depts 子元素 + * @param categorys 子元素 * @return 结果 */ - public int updateDeptChildren(@Param("depts") List depts); + public int updateCategoryChildren(@Param("categorys") List categorys); /** * 根据课件分类ID查询信息 * - * @param deptId 课件分类ID + * @param id 课件分类ID * @return 课件分类信息 */ - public TrainCoursewareCategory selectDeptById(Long deptId); + public TrainCoursewareCategory selectCategoryById(Long id); /** * 校验课件分类名称是否唯一 * - * @param deptName 课件分类名称 + * @param name 课件分类名称 * @param parentId 父课件分类ID * @return 结果 */ - public TrainCoursewareCategory checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId); + public TrainCoursewareCategory checkCategoryNameUnique(@Param("name") String name, @Param("parentId") Long parentId); - /** - * 根据角色ID查询课件分类 - * - * @param roleId 角色ID - * @return 课件分类列表 - */ - public List selectRoleDeptTree(Long roleId); } diff --git a/ruoyi-train/src/main/java/com/ruoyi/courseware/service/ITrainCoursewareCategoryService.java b/ruoyi-train/src/main/java/com/ruoyi/courseware/service/ITrainCoursewareCategoryService.java index e0aa88c68..d83f99c67 100644 --- a/ruoyi-train/src/main/java/com/ruoyi/courseware/service/ITrainCoursewareCategoryService.java +++ b/ruoyi-train/src/main/java/com/ruoyi/courseware/service/ITrainCoursewareCategoryService.java @@ -8,81 +8,81 @@ import java.util.Map; /** * 课件分类管理 服务层 - * + * * @author ruoyi */ public interface ITrainCoursewareCategoryService extends AbstractBaseService { /** * 查询课件分类管理数据 - * - * @param dept 课件分类信息 + * + * @param category 课件分类信息 * @return 课件分类信息集合 */ - public List selectDeptList(TrainCoursewareCategory dept); + public List selectCategoryList(TrainCoursewareCategory category); /** * 查询课件分类管理树 - * + * * @return 所有课件分类信息 */ - public List> selectDeptTree(); + public List> selectCategoryTree(); /** * 查询课件分类人数 - * + * * @param parentId 父课件分类ID * @return 结果 */ - public int selectDeptCount(Long parentId); + public int selectCategoryCount(Long parentId); /** * 查询课件分类是否存在用户 - * - * @param deptId 课件分类ID + * + * @param id 课件分类ID * @return 结果 true 存在 false 不存在 */ - public boolean checkDeptExistUser(Long deptId); + public boolean checkCategoryExistCourseware(Long id); /** * 删除课件分类管理信息 - * - * @param deptId 课件分类ID + * + * @param id 课件分类ID * @return 结果 */ - public int deleteDeptById(Long deptId); + public int deleteCategoryById(Long id); /** * 新增保存课件分类信息 - * - * @param dept 课件分类信息 + * + * @param category 课件分类信息 * @return 结果 */ - public int insertDept(TrainCoursewareCategory dept); + public int insertCategory(TrainCoursewareCategory category); /** * 修改保存课件分类信息 - * - * @param dept 课件分类信息 + * + * @param category 课件分类信息 * @return 结果 */ - public int updateDept(TrainCoursewareCategory dept); + public int updateCategory(TrainCoursewareCategory category); /** * 根据课件分类ID查询信息 - * - * @param deptId 课件分类ID + * + * @param id 课件分类ID * @return 课件分类信息 */ - public TrainCoursewareCategory selectDeptById(Long deptId); + public TrainCoursewareCategory selectCategoryById(Long id); /** * 校验课件分类名称是否唯一 - * - * @param dept 课件分类信息 + * + * @param category 课件分类信息 * @return 结果 */ - public String checkDeptNameUnique(TrainCoursewareCategory dept); + public String checkCategoryNameUnique(TrainCoursewareCategory category); } diff --git a/ruoyi-train/src/main/java/com/ruoyi/courseware/service/impl/TrainCoursewareCategoryServiceImpl.java b/ruoyi-train/src/main/java/com/ruoyi/courseware/service/impl/TrainCoursewareCategoryServiceImpl.java index 1f8652acc..4e6e54c38 100644 --- a/ruoyi-train/src/main/java/com/ruoyi/courseware/service/impl/TrainCoursewareCategoryServiceImpl.java +++ b/ruoyi-train/src/main/java/com/ruoyi/courseware/service/impl/TrainCoursewareCategoryServiceImpl.java @@ -31,8 +31,8 @@ public class TrainCoursewareCategoryServiceImpl extends AbstractBaseServiceImpl< */ @Override @DataScope(tableAlias = "d") - public List selectDeptList(TrainCoursewareCategory dept) { - return trainCoursewareCategoryMapper.selectDeptList( dept ); + public List selectCategoryList(TrainCoursewareCategory dept) { + return trainCoursewareCategoryMapper.selectCategoryList( dept ); } /** @@ -41,9 +41,9 @@ public class TrainCoursewareCategoryServiceImpl extends AbstractBaseServiceImpl< * @return 所有课件分类信息 */ @Override - public List> selectDeptTree() { + public List> selectCategoryTree() { List> trees = new ArrayList>(); - List deptList = selectDeptList( new TrainCoursewareCategory() ); + List deptList = selectCategoryList( new TrainCoursewareCategory() ); trees = getTrees( deptList, false, null ); return trees; } @@ -54,10 +54,10 @@ public class TrainCoursewareCategoryServiceImpl extends AbstractBaseServiceImpl< * * @param deptList 课件分类列表 * @param isCheck 是否需要选中 - * @param roleDeptList 角色已存在菜单列表 + * @param roleCategoryList 角色已存在菜单列表 * @return */ - public List> getTrees(List deptList, boolean isCheck, List roleDeptList) { + public List> getTrees(List deptList, boolean isCheck, List roleCategoryList) { List> trees = new ArrayList>(); for (TrainCoursewareCategory dept : deptList) { @@ -68,7 +68,7 @@ public class TrainCoursewareCategoryServiceImpl extends AbstractBaseServiceImpl< deptMap.put( "name", dept.getName() ); deptMap.put( "title", dept.getName() ); if (isCheck) { - deptMap.put( "checked", roleDeptList.contains( dept.getDeptId() + dept.getName() ) ); + deptMap.put( "checked", roleCategoryList.contains( dept.getId() + dept.getName() ) ); } else { deptMap.put( "checked", false ); } @@ -85,10 +85,10 @@ public class TrainCoursewareCategoryServiceImpl extends AbstractBaseServiceImpl< * @return 结果 */ @Override - public int selectDeptCount(Long parentId) { + public int selectCategoryCount(Long parentId) { TrainCoursewareCategory dept = new TrainCoursewareCategory(); dept.setParentId( parentId ); - return trainCoursewareCategoryMapper.selectDeptCount( dept ); + return trainCoursewareCategoryMapper.selectCategoryCount( dept ); } /** @@ -98,8 +98,8 @@ public class TrainCoursewareCategoryServiceImpl extends AbstractBaseServiceImpl< * @return 结果 true 存在 false 不存在 */ @Override - public boolean checkDeptExistUser(Long deptId) { - int result = trainCoursewareCategoryMapper.checkDeptExistUser( deptId ); + public boolean checkCategoryExistCourseware(Long deptId) { + int result = trainCoursewareCategoryMapper.checkCategoryExistCourseware( deptId ); return result > 0 ? true : false; } @@ -110,8 +110,8 @@ public class TrainCoursewareCategoryServiceImpl extends AbstractBaseServiceImpl< * @return 结果 */ @Override - public int deleteDeptById(Long deptId) { - return trainCoursewareCategoryMapper.deleteDeptById( deptId ); + public int deleteCategoryById(Long deptId) { + return trainCoursewareCategoryMapper.deleteCategoryById( deptId ); } /** @@ -121,27 +121,27 @@ public class TrainCoursewareCategoryServiceImpl extends AbstractBaseServiceImpl< * @return 结果 */ @Override - public int insertDept(TrainCoursewareCategory dept) { - TrainCoursewareCategory info = trainCoursewareCategoryMapper.selectDeptById( dept.getParentId() ); + public int insertCategory(TrainCoursewareCategory dept) { + TrainCoursewareCategory info = trainCoursewareCategoryMapper.selectCategoryById( dept.getParentId() ); dept.setParentIds( info.getParentIds() + "," + dept.getParentId() ); - return trainCoursewareCategoryMapper.insertDept( dept ); + return trainCoursewareCategoryMapper.insertCategory( dept ); } /** * 修改保存课件分类信息 * - * @param dept 课件分类信息 + * @param category 课件分类信息 * @return 结果 */ @Override - public int updateDept(TrainCoursewareCategory dept) { - TrainCoursewareCategory info = trainCoursewareCategoryMapper.selectDeptById( dept.getParentId() ); + public int updateCategory(TrainCoursewareCategory category) { + TrainCoursewareCategory info = trainCoursewareCategoryMapper.selectCategoryById( category.getParentId() ); if (StringUtils.isNotNull( info )) { - String ancestors = info.getParentIds() + "," + dept.getParentId(); - dept.setParentIds( ancestors ); - updateDeptChildren( dept.getDeptId(), ancestors ); + String ancestors = info.getParentIds() + "," + category.getParentId(); + category.setParentIds( ancestors ); + updateCategoryChildren( category.getId(), ancestors ); } - return trainCoursewareCategoryMapper.updateDept( dept ); + return trainCoursewareCategoryMapper.updateCategory( category ); } /** @@ -150,15 +150,15 @@ public class TrainCoursewareCategoryServiceImpl extends AbstractBaseServiceImpl< * @param deptId 课件分类ID * @param ancestors 元素列表 */ - public void updateDeptChildren(Long deptId, String ancestors) { + public void updateCategoryChildren(Long deptId, String ancestors) { TrainCoursewareCategory dept = new TrainCoursewareCategory(); dept.setParentId( deptId ); - List childrens = trainCoursewareCategoryMapper.selectDeptList( dept ); + List childrens = trainCoursewareCategoryMapper.selectCategoryList( dept ); for (TrainCoursewareCategory children : childrens) { children.setParentIds( ancestors + "," + dept.getParentId() ); } if (childrens.size() > 0) { - trainCoursewareCategoryMapper.updateDeptChildren( childrens ); + trainCoursewareCategoryMapper.updateCategoryChildren( childrens ); } } @@ -169,8 +169,8 @@ public class TrainCoursewareCategoryServiceImpl extends AbstractBaseServiceImpl< * @return 课件分类信息 */ @Override - public TrainCoursewareCategory selectDeptById(Long deptId) { - return trainCoursewareCategoryMapper.selectDeptById( deptId ); + public TrainCoursewareCategory selectCategoryById(Long id) { + return trainCoursewareCategoryMapper.selectCategoryById( id ); } /** @@ -180,10 +180,10 @@ public class TrainCoursewareCategoryServiceImpl extends AbstractBaseServiceImpl< * @return 结果 */ @Override - public String checkDeptNameUnique(TrainCoursewareCategory dept) { - Long deptId = StringUtils.isNull( dept.getDeptId() ) ? -1L : dept.getDeptId(); - TrainCoursewareCategory info = trainCoursewareCategoryMapper.checkDeptNameUnique( dept.getName(), dept.getParentId() ); - if (StringUtils.isNotNull( info ) && info.getDeptId().longValue() != deptId.longValue()) { + public String checkCategoryNameUnique(TrainCoursewareCategory dept) { + Long deptId = StringUtils.isNull( dept.getId() ) ? -1L : dept.getId(); + TrainCoursewareCategory info = trainCoursewareCategoryMapper.checkCategoryNameUnique( dept.getName(), dept.getParentId() ); + if (StringUtils.isNotNull( info ) && info.getId().longValue() != deptId.longValue()) { return UserConstants.DEPT_NAME_NOT_UNIQUE; } return UserConstants.DEPT_NAME_UNIQUE; diff --git a/ruoyi-train/src/main/java/com/ruoyi/exam/controller/TrainCourseCategoryController.java b/ruoyi-train/src/main/java/com/ruoyi/exam/controller/TrainCourseCategoryController.java deleted file mode 100644 index ed60daa73..000000000 --- a/ruoyi-train/src/main/java/com/ruoyi/exam/controller/TrainCourseCategoryController.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.ruoyi.web.controller.exam; - -import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.exam.domain.TrainCourseCategory; -import com.ruoyi.exam.service.ITrainCourseCategoryService; -import com.ruoyi.framework.web.base.BaseController; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.common.base.AjaxResult; -import com.ruoyi.common.utils.ExcelUtil; - -/** - * 课程分类 信息操作处理 - * - * @author zhujj - * @date 2018-12-12 - */ -@Controller -@RequestMapping("/exam/trainCourseCategory") -public class TrainCourseCategoryController extends BaseController -{ - private String prefix = "exam/trainCourseCategory"; - - @Autowired - private ITrainCourseCategoryService trainCourseCategoryService; - - @RequiresPermissions("exam:trainCourseCategory:view") - @GetMapping() - public String trainCourseCategory() - { - return prefix + "/trainCourseCategory"; - } - - /** - * 查询课程分类列表 - */ - @RequiresPermissions("exam:trainCourseCategory:list") - @GetMapping("/list") - @ResponseBody - public List list(TrainCourseCategory trainCourseCategory) - { - List list = trainCourseCategoryService.selectTrainCourseCategoryPage(trainCourseCategory); - return list; - } - - - /** - * 导出课程分类列表 - */ - @RequiresPermissions("exam:trainCourseCategory:export") - @PostMapping("/export") - @ResponseBody - public AjaxResult export(TrainCourseCategory trainCourseCategory) - { - List list = trainCourseCategoryService.selectTrainCourseCategoryList(trainCourseCategory); - ExcelUtil util = new ExcelUtil(TrainCourseCategory.class); - return util.exportExcel(list, "trainCourseCategory"); - } - - /** - * 新增课程分类 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存课程分类 - */ - @RequiresPermissions("exam:trainCourseCategory:add") - @Log(title = "课程分类", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(TrainCourseCategory trainCourseCategory) - { - return toAjax(trainCourseCategoryService.insert(trainCourseCategory)); - } - - /** - * 修改课程分类 - */ - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") Integer id, ModelMap mmap) - { - TrainCourseCategory trainCourseCategory = trainCourseCategoryService.selectById(id); - mmap.put("trainCourseCategory", trainCourseCategory); - return prefix + "/edit"; - } - - /** - * 修改保存课程分类 - */ - @RequiresPermissions("exam:trainCourseCategory:edit") - @Log(title = "课程分类", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(TrainCourseCategory trainCourseCategory) - { - return toAjax(trainCourseCategoryService.updateById(trainCourseCategory)); - } - - /** - * 删除课程分类 - */ - @RequiresPermissions("exam:trainCourseCategory:remove") - @Log(title = "课程分类", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(trainCourseCategoryService.deleteByIds(ids)); - } - -} diff --git a/ruoyi-train/src/main/java/com/ruoyi/exam/controller/TrainCoursewareCategoryController.java b/ruoyi-train/src/main/java/com/ruoyi/exam/controller/TrainCoursewareCategoryController.java deleted file mode 100644 index 664e9a7fc..000000000 --- a/ruoyi-train/src/main/java/com/ruoyi/exam/controller/TrainCoursewareCategoryController.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.ruoyi.web.controller.exam; - -import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.exam.domain.TrainCoursewareCategory; -import com.ruoyi.exam.service.ITrainCoursewareCategoryService; -import com.ruoyi.framework.web.base.BaseController; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.common.base.AjaxResult; -import com.ruoyi.common.utils.ExcelUtil; - -/** - * 课件分类 信息操作处理 - * - * @author zhujj - * @date 2018-12-12 - */ -@Controller -@RequestMapping("/exam/trainCoursewareCategory") -public class TrainCoursewareCategoryController extends BaseController -{ - private String prefix = "exam/trainCoursewareCategory"; - - @Autowired - private ITrainCoursewareCategoryService trainCoursewareCategoryService; - - @RequiresPermissions("exam:trainCoursewareCategory:view") - @GetMapping() - public String trainCoursewareCategory() - { - return prefix + "/trainCoursewareCategory"; - } - - /** - * 查询课件分类列表 - */ - @RequiresPermissions("exam:trainCoursewareCategory:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(TrainCoursewareCategory trainCoursewareCategory) - { - List list = trainCoursewareCategoryService.selectTrainCoursewareCategoryPage(trainCoursewareCategory); - return getDataTable(list); - } - - - /** - * 导出课件分类列表 - */ - @RequiresPermissions("exam:trainCoursewareCategory:export") - @PostMapping("/export") - @ResponseBody - public AjaxResult export(TrainCoursewareCategory trainCoursewareCategory) - { - List list = trainCoursewareCategoryService.selectTrainCoursewareCategoryList(trainCoursewareCategory); - ExcelUtil util = new ExcelUtil(TrainCoursewareCategory.class); - return util.exportExcel(list, "trainCoursewareCategory"); - } - - /** - * 新增课件分类 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存课件分类 - */ - @RequiresPermissions("exam:trainCoursewareCategory:add") - @Log(title = "课件分类", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(TrainCoursewareCategory trainCoursewareCategory) - { - return toAjax(trainCoursewareCategoryService.insert(trainCoursewareCategory)); - } - - /** - * 修改课件分类 - */ - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") Integer id, ModelMap mmap) - { - TrainCoursewareCategory trainCoursewareCategory = trainCoursewareCategoryService.selectById(id); - mmap.put("trainCoursewareCategory", trainCoursewareCategory); - return prefix + "/edit"; - } - - /** - * 修改保存课件分类 - */ - @RequiresPermissions("exam:trainCoursewareCategory:edit") - @Log(title = "课件分类", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(TrainCoursewareCategory trainCoursewareCategory) - { - return toAjax(trainCoursewareCategoryService.updateById(trainCoursewareCategory)); - } - - /** - * 删除课件分类 - */ - @RequiresPermissions("exam:trainCoursewareCategory:remove") - @Log(title = "课件分类", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(trainCoursewareCategoryService.deleteByIds(ids)); - } - -} diff --git a/ruoyi-train/src/main/java/com/ruoyi/exam/domain/TrainCourseCategory.java b/ruoyi-train/src/main/java/com/ruoyi/exam/domain/TrainCourseCategory.java deleted file mode 100644 index 1da030c4a..000000000 --- a/ruoyi-train/src/main/java/com/ruoyi/exam/domain/TrainCourseCategory.java +++ /dev/null @@ -1,194 +0,0 @@ -package com.ruoyi.exam.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.base.BaseEntity; - import javax.persistence.Id; - import java.util.Date; - -/** - * 课程分类表 train_course_category - * - * @author zhujj - * @date 2018-12-12 - */ -public class TrainCourseCategory -{ -private static final long serialVersionUID = 1L; - - /** 部门id */ - @Id - private Integer id; - /** 部门ID */ - private Integer deptId; - /** 父部门id */ - private Integer parentId; - /** 祖级列表 */ - private String parentIds; - /** 分类名称 */ - private String name; - /** 显示顺序 */ - private Integer orderNum; - /** 删除标志（0代表存在 2代表删除） */ - private String delFlag; - /** 创建者 */ - private String createBy; - /** 创建时间 */ - private Date createTime; - /** 更新者 */ - private String updateBy; - /** 更新时间 */ - private Date updateTime; - /** 备注 */ - private String remark; - - /** 设置部门id */ - public void setId(Integer id) - { - this.id = id; - } - - /** 获取部门id */ - public Integer getId() - { - return id; - } - /** 设置部门ID */ - public void setDeptId(Integer deptId) - { - this.deptId = deptId; - } - - /** 获取部门ID */ - public Integer getDeptId() - { - return deptId; - } - /** 设置父部门id */ - public void setParentId(Integer parentId) - { - this.parentId = parentId; - } - - /** 获取父部门id */ - public Integer getParentId() - { - return parentId; - } - /** 设置祖级列表 */ - public void setParentIds(String parentIds) - { - this.parentIds = parentIds; - } - - /** 获取祖级列表 */ - public String getParentIds() - { - return parentIds; - } - /** 设置分类名称 */ - public void setName(String name) - { - this.name = name; - } - - /** 获取分类名称 */ - public String getName() - { - return name; - } - /** 设置显示顺序 */ - public void setOrderNum(Integer orderNum) - { - this.orderNum = orderNum; - } - - /** 获取显示顺序 */ - public Integer getOrderNum() - { - return orderNum; - } - /** 设置删除标志（0代表存在 2代表删除） */ - public void setDelFlag(String delFlag) - { - this.delFlag = delFlag; - } - - /** 获取删除标志（0代表存在 2代表删除） */ - public String getDelFlag() - { - return delFlag; - } - /** 设置创建者 */ - public void setCreateBy(String createBy) - { - this.createBy = createBy; - } - - /** 获取创建者 */ - public String getCreateBy() - { - return createBy; - } - /** 设置创建时间 */ - public void setCreateTime(Date createTime) - { - this.createTime = createTime; - } - - /** 获取创建时间 */ - public Date getCreateTime() - { - return createTime; - } - /** 设置更新者 */ - public void setUpdateBy(String updateBy) - { - this.updateBy = updateBy; - } - - /** 获取更新者 */ - public String getUpdateBy() - { - return updateBy; - } - /** 设置更新时间 */ - public void setUpdateTime(Date updateTime) - { - this.updateTime = updateTime; - } - - /** 获取更新时间 */ - public Date getUpdateTime() - { - return updateTime; - } - /** 设置备注 */ - public void setRemark(String remark) - { - this.remark = remark; - } - - /** 获取备注 */ - public String getRemark() - { - return remark; - } - -public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("parentId", getParentId()) - .append("parentIds", getParentIds()) - .append("name", getName()) - .append("orderNum", getOrderNum()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } - } diff --git a/ruoyi-train/src/main/java/com/ruoyi/exam/domain/TrainCoursewareCategory.java b/ruoyi-train/src/main/java/com/ruoyi/exam/domain/TrainCoursewareCategory.java deleted file mode 100644 index e480ca510..000000000 --- a/ruoyi-train/src/main/java/com/ruoyi/exam/domain/TrainCoursewareCategory.java +++ /dev/null @@ -1,194 +0,0 @@ -package com.ruoyi.exam.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.base.BaseEntity; - import javax.persistence.Id; - import java.util.Date; - -/** - * 课件分类表 train_courseware_category - * - * @author zhujj - * @date 2018-12-12 - */ -public class TrainCoursewareCategory -{ -private static final long serialVersionUID = 1L; - - /** 部门id */ - @Id - private Integer id; - /** 部门ID */ - private Integer deptId; - /** 父部门id */ - private Integer parentId; - /** 祖级列表 */ - private String parentIds; - /** 部门名称 */ - private String name; - /** 显示顺序 */ - private Integer orderNum; - /** 删除标志（0代表存在 2代表删除） */ - private String delFlag; - /** 创建者 */ - private String createBy; - /** 创建时间 */ - private Date createTime; - /** 更新者 */ - private String updateBy; - /** 更新时间 */ - private Date updateTime; - /** 备注 */ - private String remark; - - /** 设置部门id */ - public void setId(Integer id) - { - this.id = id; - } - - /** 获取部门id */ - public Integer getId() - { - return id; - } - /** 设置部门ID */ - public void setDeptId(Integer deptId) - { - this.deptId = deptId; - } - - /** 获取部门ID */ - public Integer getDeptId() - { - return deptId; - } - /** 设置父部门id */ - public void setParentId(Integer parentId) - { - this.parentId = parentId; - } - - /** 获取父部门id */ - public Integer getParentId() - { - return parentId; - } - /** 设置祖级列表 */ - public void setParentIds(String parentIds) - { - this.parentIds = parentIds; - } - - /** 获取祖级列表 */ - public String getParentIds() - { - return parentIds; - } - /** 设置部门名称 */ - public void setName(String name) - { - this.name = name; - } - - /** 获取部门名称 */ - public String getName() - { - return name; - } - /** 设置显示顺序 */ - public void setOrderNum(Integer orderNum) - { - this.orderNum = orderNum; - } - - /** 获取显示顺序 */ - public Integer getOrderNum() - { - return orderNum; - } - /** 设置删除标志（0代表存在 2代表删除） */ - public void setDelFlag(String delFlag) - { - this.delFlag = delFlag; - } - - /** 获取删除标志（0代表存在 2代表删除） */ - public String getDelFlag() - { - return delFlag; - } - /** 设置创建者 */ - public void setCreateBy(String createBy) - { - this.createBy = createBy; - } - - /** 获取创建者 */ - public String getCreateBy() - { - return createBy; - } - /** 设置创建时间 */ - public void setCreateTime(Date createTime) - { - this.createTime = createTime; - } - - /** 获取创建时间 */ - public Date getCreateTime() - { - return createTime; - } - /** 设置更新者 */ - public void setUpdateBy(String updateBy) - { - this.updateBy = updateBy; - } - - /** 获取更新者 */ - public String getUpdateBy() - { - return updateBy; - } - /** 设置更新时间 */ - public void setUpdateTime(Date updateTime) - { - this.updateTime = updateTime; - } - - /** 获取更新时间 */ - public Date getUpdateTime() - { - return updateTime; - } - /** 设置备注 */ - public void setRemark(String remark) - { - this.remark = remark; - } - - /** 获取备注 */ - public String getRemark() - { - return remark; - } - -public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("parentId", getParentId()) - .append("parentIds", getParentIds()) - .append("name", getName()) - .append("orderNum", getOrderNum()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } - } diff --git a/ruoyi-train/src/main/java/com/ruoyi/exam/mapper/TrainCourseCategoryMapper.java b/ruoyi-train/src/main/java/com/ruoyi/exam/mapper/TrainCourseCategoryMapper.java deleted file mode 100644 index bdcd479b8..000000000 --- a/ruoyi-train/src/main/java/com/ruoyi/exam/mapper/TrainCourseCategoryMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.ruoyi.exam.mapper; - -import com.ruoyi.exam.domain.TrainCourseCategory; -import java.util.List; -import com.ruoyi.framework.web.base.MyMapper; - -/** - * 课程分类 数据层 - * - * @author zhujj - * @date 2018-12-12 - */ -public interface TrainCourseCategoryMapper extends MyMapper -{ - - /** - * 查询课程分类列表 - * - * @param trainCourseCategory 课程分类信息 - * @return 课程分类集合 - */ - public List selectTrainCourseCategoryList(TrainCourseCategory trainCourseCategory); - -} \ No newline at end of file diff --git a/ruoyi-train/src/main/java/com/ruoyi/exam/mapper/TrainCoursewareCategoryMapper.java b/ruoyi-train/src/main/java/com/ruoyi/exam/mapper/TrainCoursewareCategoryMapper.java deleted file mode 100644 index 011d9b527..000000000 --- a/ruoyi-train/src/main/java/com/ruoyi/exam/mapper/TrainCoursewareCategoryMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.ruoyi.exam.mapper; - -import com.ruoyi.exam.domain.TrainCoursewareCategory; -import java.util.List; -import com.ruoyi.framework.web.base.MyMapper; - -/** - * 课件分类 数据层 - * - * @author zhujj - * @date 2018-12-12 - */ -public interface TrainCoursewareCategoryMapper extends MyMapper -{ - - /** - * 查询课件分类列表 - * - * @param trainCoursewareCategory 课件分类信息 - * @return 课件分类集合 - */ - public List selectTrainCoursewareCategoryList(TrainCoursewareCategory trainCoursewareCategory); - -} \ No newline at end of file diff --git a/ruoyi-train/src/main/java/com/ruoyi/exam/service/ITrainCourseCategoryService.java b/ruoyi-train/src/main/java/com/ruoyi/exam/service/ITrainCourseCategoryService.java deleted file mode 100644 index e517f9875..000000000 --- a/ruoyi-train/src/main/java/com/ruoyi/exam/service/ITrainCourseCategoryService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.ruoyi.exam.service; - -import com.ruoyi.exam.domain.TrainCourseCategory; -import java.util.List; -import com.ruoyi.framework.web.base.AbstractBaseService; -/** - * 课程分类 服务层 - * - * @author zhujj - * @date 2018-12-12 - */ -public interface ITrainCourseCategoryService extends AbstractBaseService -{ - /** - * 查询课程分类分页列表 - * - * @param trainCourseCategory 课程分类信息 - * @return 课程分类集合 - */ - public List selectTrainCourseCategoryPage(TrainCourseCategory trainCourseCategory); - /** - * 查询课程分类列表 - * - * @param trainCourseCategory 课程分类信息 - * @return 课程分类集合 - */ - public List selectTrainCourseCategoryList(TrainCourseCategory trainCourseCategory); - - -} diff --git a/ruoyi-train/src/main/java/com/ruoyi/exam/service/ITrainCoursewareCategoryService.java b/ruoyi-train/src/main/java/com/ruoyi/exam/service/ITrainCoursewareCategoryService.java deleted file mode 100644 index e5bd92fcd..000000000 --- a/ruoyi-train/src/main/java/com/ruoyi/exam/service/ITrainCoursewareCategoryService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.ruoyi.exam.service; - -import com.ruoyi.exam.domain.TrainCoursewareCategory; -import java.util.List; -import com.ruoyi.framework.web.base.AbstractBaseService; -/** - * 课件分类 服务层 - * - * @author zhujj - * @date 2018-12-12 - */ -public interface ITrainCoursewareCategoryService extends AbstractBaseService -{ - /** - * 查询课件分类分页列表 - * - * @param trainCoursewareCategory 课件分类信息 - * @return 课件分类集合 - */ - public List selectTrainCoursewareCategoryPage(TrainCoursewareCategory trainCoursewareCategory); - /** - * 查询课件分类列表 - * - * @param trainCoursewareCategory 课件分类信息 - * @return 课件分类集合 - */ - public List selectTrainCoursewareCategoryList(TrainCoursewareCategory trainCoursewareCategory); - - -} diff --git a/ruoyi-train/src/main/java/com/ruoyi/exam/service/impl/TrainCourseCategoryServiceImpl.java b/ruoyi-train/src/main/java/com/ruoyi/exam/service/impl/TrainCourseCategoryServiceImpl.java deleted file mode 100644 index 5457a1a3d..000000000 --- a/ruoyi-train/src/main/java/com/ruoyi/exam/service/impl/TrainCourseCategoryServiceImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.ruoyi.exam.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.exam.mapper.TrainCourseCategoryMapper; -import com.ruoyi.exam.domain.TrainCourseCategory; -import com.ruoyi.exam.service.ITrainCourseCategoryService; -import com.ruoyi.common.support.Convert; -import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; -/** - * 课程分类 服务层实现 - * - * @author zhujj - * @date 2018-12-12 - */ -@Service -public class TrainCourseCategoryServiceImpl extends AbstractBaseServiceImpl implements ITrainCourseCategoryService -{ - @Autowired - private TrainCourseCategoryMapper trainCourseCategoryMapper; - - - /** - * 查询课程分类列表 - * - * @param trainCourseCategory 课程分类信息 - * @return 课程分类集合 - */ - @Override - public List selectTrainCourseCategoryList(TrainCourseCategory trainCourseCategory) - { - return trainCourseCategoryMapper.selectTrainCourseCategoryList(trainCourseCategory); - } - /** - * 查询课程分类分页列表 - * - * @param trainCourseCategory 课程分类信息 - * @return 课程分类集合 - */ - @Override - public List selectTrainCourseCategoryPage(TrainCourseCategory trainCourseCategory) - { - startPage(); - return trainCourseCategoryMapper.selectTrainCourseCategoryList(trainCourseCategory); - } - -} diff --git a/ruoyi-train/src/main/java/com/ruoyi/exam/service/impl/TrainCoursewareCategoryServiceImpl.java b/ruoyi-train/src/main/java/com/ruoyi/exam/service/impl/TrainCoursewareCategoryServiceImpl.java deleted file mode 100644 index 32642e390..000000000 --- a/ruoyi-train/src/main/java/com/ruoyi/exam/service/impl/TrainCoursewareCategoryServiceImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.ruoyi.exam.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.exam.mapper.TrainCoursewareCategoryMapper; -import com.ruoyi.exam.domain.TrainCoursewareCategory; -import com.ruoyi.exam.service.ITrainCoursewareCategoryService; -import com.ruoyi.common.support.Convert; -import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; -/** - * 课件分类 服务层实现 - * - * @author zhujj - * @date 2018-12-12 - */ -@Service -public class TrainCoursewareCategoryServiceImpl extends AbstractBaseServiceImpl implements ITrainCoursewareCategoryService -{ - @Autowired - private TrainCoursewareCategoryMapper trainCoursewareCategoryMapper; - - - /** - * 查询课件分类列表 - * - * @param trainCoursewareCategory 课件分类信息 - * @return 课件分类集合 - */ - @Override - public List selectTrainCoursewareCategoryList(TrainCoursewareCategory trainCoursewareCategory) - { - return trainCoursewareCategoryMapper.selectTrainCoursewareCategoryList(trainCoursewareCategory); - } - /** - * 查询课件分类分页列表 - * - * @param trainCoursewareCategory 课件分类信息 - * @return 课件分类集合 - */ - @Override - public List selectTrainCoursewareCategoryPage(TrainCoursewareCategory trainCoursewareCategory) - { - startPage(); - return trainCoursewareCategoryMapper.selectTrainCoursewareCategoryList(trainCoursewareCategory); - } - -} diff --git a/ruoyi-train/src/main/resources/mapper/course/TrainCourseCategoryMapper.xml b/ruoyi-train/src/main/resources/mapper/course/TrainCourseCategoryMapper.xml index f016c9f4c..91e4adbff 100644 --- a/ruoyi-train/src/main/resources/mapper/course/TrainCourseCategoryMapper.xml +++ b/ruoyi-train/src/main/resources/mapper/course/TrainCourseCategoryMapper.xml @@ -21,11 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select d.id,d.dept_id, d.parent_id, d.parent_ids, d.name, d.order_num, d.del_flag, d.create_by, d.create_time - from train_courseware_category d + from train_course_category d - + select count(1) from train_course where train_course_category_id = #{id} and del_flag = '0' - insert into train_courseware_category( + insert into train_course_category( id, parent_id, name, @@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update train_courseware_category + update train_course_category parent_id = #{parentId}, name = #{name}, @@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update train_courseware_category set parent_ids = + update train_course_category set parent_ids = when #{item.id} then #{item.parent_ids} @@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update train_courseware_category set del_flag = '2' where id = #{id} + update train_course_category set del_flag = '2' where id = #{id} \ No newline at end of file diff --git a/ruoyi-train/src/main/resources/mapper/courseware/TrainCoursewareCategoryMapper.xml b/ruoyi-train/src/main/resources/mapper/courseware/TrainCoursewareCategoryMapper.xml index 3a2d39f6f..5cb484330 100644 --- a/ruoyi-train/src/main/resources/mapper/courseware/TrainCoursewareCategoryMapper.xml +++ b/ruoyi-train/src/main/resources/mapper/courseware/TrainCoursewareCategoryMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -19,20 +19,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select d.id,d.dept_id, d.parent_id, d.parent_ids, d.name, d.order_num, d.del_flag, d.create_by, d.create_time from train_courseware_category d - - + where d.del_flag = '0' AND parent_id = #{parentId} @@ -45,30 +38,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} - + select count(1) from train_courseware where train_courseware_category_id = #{id} and del_flag = '0' - select count(1) from train_courseware_category where del_flag = '0' and id = #{id} and parent_id = #{parentId} - + where name=#{name} and parent_id = #{parentId} - + select d.id, d.parent_id, d.parent_ids, d.name, d.order_num, d.del_flag, (select name from train_courseware_category where id = d.parent_id) parent_name from train_courseware_category d where d.id = #{id} - + insert into train_courseware_category( id, parent_id, @@ -90,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update train_courseware_category parent_id = #{parentId}, @@ -104,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + update train_courseware_category set parent_ids = @@ -117,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update train_courseware_category set del_flag = '2' where id = #{id} diff --git a/ruoyi-train/src/main/resources/mapper/exam/TrainCourseCategoryMapper.xml b/ruoyi-train/src/main/resources/mapper/exam/TrainCourseCategoryMapper.xml deleted file mode 100644 index 97348c70f..000000000 --- a/ruoyi-train/src/main/resources/mapper/exam/TrainCourseCategoryMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - id, dept_id, parent_id, parent_ids, name, order_num, del_flag, create_by, create_time, update_by, update_time, remark - - - - - \ No newline at end of file diff --git a/ruoyi-train/src/main/resources/mapper/exam/TrainCoursewareCategoryMapper.xml b/ruoyi-train/src/main/resources/mapper/exam/TrainCoursewareCategoryMapper.xml deleted file mode 100644 index a4d988274..000000000 --- a/ruoyi-train/src/main/resources/mapper/exam/TrainCoursewareCategoryMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - id, dept_id, parent_id, parent_ids, name, order_num, del_flag, create_by, create_time, update_by, update_time, remark - - - - - \ No newline at end of file diff --git a/ruoyi-train/src/main/resources/templates/course/category/dept.html b/ruoyi-train/src/main/resources/templates/course/category/category.html similarity index 99% rename from ruoyi-train/src/main/resources/templates/course/category/dept.html rename to ruoyi-train/src/main/resources/templates/course/category/category.html index 0ed1808c5..abc1aad78 100644 --- a/ruoyi-train/src/main/resources/templates/course/category/dept.html +++ b/ruoyi-train/src/main/resources/templates/course/category/category.html @@ -79,6 +79,7 @@ title: '操作', align: 'left', formatter: function(value, row, index) { + debugger if (row.parentId != 0) { var actions = []; actions.push('编辑 '); diff --git a/ruoyi-train/src/main/resources/templates/course/category/edit.html b/ruoyi-train/src/main/resources/templates/course/category/edit.html index 4277c47bd..fbc57c314 100644 --- a/ruoyi-train/src/main/resources/templates/course/category/edit.html +++ b/ruoyi-train/src/main/resources/templates/course/category/edit.html @@ -16,7 +16,7 @@
    - +
    @@ -26,28 +26,10 @@
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - +
    - +
    @@ -56,11 +38,11 @@