From af7939d01504db6e7dbbc558ac1d80d955758bb2 Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期二, 16 七月 2024 17:34:29 +0800 Subject: [PATCH] feat:科目名重复限制 --- src/main/java/com/mindskip/xzs/service/SubjectService.java | 6 +++--- src/main/java/com/mindskip/xzs/service/impl/NotifyServiceImpl.java | 1 - src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java | 15 ++++++++++----- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/mindskip/xzs/service/SubjectService.java b/src/main/java/com/mindskip/xzs/service/SubjectService.java index cf449a4..85753ee 100644 --- a/src/main/java/com/mindskip/xzs/service/SubjectService.java +++ b/src/main/java/com/mindskip/xzs/service/SubjectService.java @@ -1,11 +1,11 @@ package com.mindskip.xzs.service; +import com.github.pagehelper.PageInfo; +import com.mindskip.xzs.base.RestResponse; import com.mindskip.xzs.domain.Subject; import com.mindskip.xzs.domain.form.AddSubjectForm; import com.mindskip.xzs.domain.form.EditSubjectForm; import com.mindskip.xzs.viewmodel.admin.education.SubjectPageRequestVM; -import com.github.pagehelper.PageInfo; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -36,7 +36,7 @@ * * @param form */ - void add(AddSubjectForm form); + RestResponse add(AddSubjectForm form); /** * 淇敼閮ㄩ棬璇剧洰 diff --git a/src/main/java/com/mindskip/xzs/service/impl/NotifyServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/NotifyServiceImpl.java index 33e9199..cdd78f8 100644 --- a/src/main/java/com/mindskip/xzs/service/impl/NotifyServiceImpl.java +++ b/src/main/java/com/mindskip/xzs/service/impl/NotifyServiceImpl.java @@ -22,7 +22,6 @@ @Override public void add(Notify notify) { - notify.setDeleted(0); notifyMapper.add(notify); } diff --git a/src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java index feeecc0..5581e44 100644 --- a/src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java +++ b/src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java @@ -1,5 +1,8 @@ package com.mindskip.xzs.service.impl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.mindskip.xzs.base.RestResponse; import com.mindskip.xzs.context.WebContext; import com.mindskip.xzs.domain.Subject; import com.mindskip.xzs.domain.SubjectDept; @@ -12,9 +15,6 @@ import com.mindskip.xzs.repository.SubjectMapper; import com.mindskip.xzs.service.SubjectService; import com.mindskip.xzs.viewmodel.admin.education.SubjectPageRequestVM; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -90,11 +90,15 @@ @Override @Transactional(rollbackFor = Exception.class) - public void add(AddSubjectForm form) { + public RestResponse add(AddSubjectForm form) { Subject subject = new Subject(); subject.setName(form.getSubjectName()); subject.setDeleted(false); - subjectMapper.insert(subject); + try { + subjectMapper.insert(subject); + } catch (Exception e) { + return RestResponse.fail(500, "绉戠洰鍚嶄笉鑳介噸澶�"); + } SubjectDept subjectDept = new SubjectDept(); subjectDept.setDeptId(form.getDeptId()); @@ -102,6 +106,7 @@ List<SubjectDept> s = new ArrayList<>(1); s.add(subjectDept); subjectDeptMapper.add(s); + return RestResponse.ok(); } @Override -- Gitblit v1.8.0