diff --git a/ruoyi_edu/pom.xml b/ruoyi_edu/pom.xml index 9e91788..5197f3b 100644 --- a/ruoyi_edu/pom.xml +++ b/ruoyi_edu/pom.xml @@ -20,6 +20,10 @@ com.ruoyi ruoyi-common + + com.ruoyi + ruoyi-system + \ No newline at end of file diff --git a/ruoyi_edu/src/main/java/com/ruoyi/edu/controller/EduClazzController.java b/ruoyi_edu/src/main/java/com/ruoyi/edu/controller/EduClazzController.java index f3ce7fa..e7e7345 100644 --- a/ruoyi_edu/src/main/java/com/ruoyi/edu/controller/EduClazzController.java +++ b/ruoyi_edu/src/main/java/com/ruoyi/edu/controller/EduClazzController.java @@ -7,6 +7,7 @@ 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.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -20,6 +21,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.web.multipart.MultipartFile; /** * 班级管理Controller @@ -70,6 +72,8 @@ public class EduClazzController extends BaseController return util.exportExcel(list, "班级管理数据"); } + + /** * 新增班级管理 */ @@ -98,8 +102,11 @@ public class EduClazzController extends BaseController @GetMapping("/edit/{id}") public String edit(@PathVariable("id") Long id, ModelMap mmap) { + eduClazzService.checkClazzDataScope(id); EduClazz eduClazz = eduClazzService.selectEduClazzById(id); mmap.put("eduClazz", eduClazz); + mmap.put("clazz",eduClazzService.selectEduClazzById(id)); + System.out.println(clazz()); return prefix + "/edit"; } @@ -110,8 +117,11 @@ public class EduClazzController extends BaseController @Log(title = "班级管理", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(EduClazz eduClazz) + public AjaxResult editSave(@Validated EduClazz eduClazz) { + eduClazzService.checkClazzAllowed(eduClazz); + eduClazzService.checkClazzDataScope(eduClazz.getId()); + eduClazz.setUpdateBy(getLoginName()); return toAjax(eduClazzService.updateEduClazz(eduClazz)); } diff --git a/ruoyi_edu/src/main/java/com/ruoyi/edu/service/impl/EduClazzServiceImpl.java b/ruoyi_edu/src/main/java/com/ruoyi/edu/service/impl/EduClazzServiceImpl.java index 7829e8c..87ca22e 100644 --- a/ruoyi_edu/src/main/java/com/ruoyi/edu/service/impl/EduClazzServiceImpl.java +++ b/ruoyi_edu/src/main/java/com/ruoyi/edu/service/impl/EduClazzServiceImpl.java @@ -6,7 +6,10 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.bean.BeanValidators; +import com.ruoyi.common.utils.security.Md5Utils; import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.system.service.ISysConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.edu.mapper.EduClazzMapper; @@ -26,6 +29,9 @@ public class EduClazzServiceImpl implements IEduClazzService @Autowired private EduClazzMapper eduClazzMapper; + @Autowired + private ISysConfigService configService; + /** * 查询班级管理 * @@ -126,4 +132,6 @@ public class EduClazzServiceImpl implements IEduClazzService public int changeStatus(EduClazz clazz) { return eduClazzMapper.updateEduClazz(clazz); } + + } diff --git a/ruoyi_edu/src/main/resources/templates/edu/clazz/clazz.html b/ruoyi_edu/src/main/resources/templates/edu/clazz/clazz.html index 7fa1bc6..fa67d92 100644 --- a/ruoyi_edu/src/main/resources/templates/edu/clazz/clazz.html +++ b/ruoyi_edu/src/main/resources/templates/edu/clazz/clazz.html @@ -45,6 +45,9 @@ 删除 + + 导入 + 导出 @@ -67,6 +70,8 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", + importUrl: prefix + "/importData", + importTemplateUrl: prefix + "/importTemplate", modalName: "班级管理", columns: [{ checkbox: true @@ -132,4 +137,19 @@ } + + \ No newline at end of file diff --git a/ruoyi_edu/src/main/resources/templates/edu/clazz/edit.html b/ruoyi_edu/src/main/resources/templates/edu/clazz/edit.html index 77062e4..098ef67 100644 --- a/ruoyi_edu/src/main/resources/templates/edu/clazz/edit.html +++ b/ruoyi_edu/src/main/resources/templates/edu/clazz/edit.html @@ -22,7 +22,11 @@
- + +
@@ -36,7 +40,11 @@ function submitHandler() { if ($.validate.form()) { - $.operate.save(prefix + "/edit", $('#form-clazz-edit').serialize()); + var data = $("#form-clazz-edit").serializeArray(); + var visible=$("input[id='visible']").is(':checked') == true ? 0 : 1; + console.log(visible); + data.push({"name": "visible", "value": visible}); + $.operate.save(prefix + "/edit", data); } }