字典管理修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicCampusServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.params.BasicCampusParams;
@@ -16,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -42,13 +44,22 @@ public class BasicCampusServiceImpl extends ServiceImpl<BasicCampusMapper, Basic
         Long schoolId = sysUser.getSchoolId();
         Long orgId = sysUser.getOrgId();
 
+        Long campusId = basicCampusParams.getId();
         String campusName = basicCampusParams.getCampusName();
         String campusCode = basicCampusParams.getCampusCode();
         if (!SystemConstant.strNotNull(campusCode)){
             throw ExceptionResultEnum.ERROR.exception("缺少校区编号");
         }
-        Long campusId;
-        if (SystemConstant.longNotNull(basicCampusParams.getId())){
+        BasicCampus checkName = this.getOne(new QueryWrapper<BasicCampus>().lambda().eq(BasicCampus::getEnable,true).eq(BasicCampus::getSchoolId,schoolId).eq(BasicCampus::getCampusName,campusName));
+        if (Objects.nonNull(checkName) && !checkName.getId().equals(campusId)){
+            throw ExceptionResultEnum.ERROR.exception("校区名称【" + campusName + "】重复");
+        }
+        BasicCampus checkCode = this.getOne(new QueryWrapper<BasicCampus>().lambda().eq(BasicCampus::getEnable,true).eq(BasicCampus::getSchoolId,schoolId).eq(BasicCampus::getCampusCode,campusCode));
+        if (Objects.nonNull(checkCode) && !checkCode.getId().equals(campusId)){
+            throw ExceptionResultEnum.ERROR.exception("校区编号【" + campusCode + "】重复");
+        }
+
+        if (SystemConstant.longNotNull(campusId)){
             // 编辑
             campusId = basicCampusParams.getId();
             UpdateWrapper<BasicCampus> updateWrapper = new UpdateWrapper<>();
@@ -62,6 +73,10 @@ public class BasicCampusServiceImpl extends ServiceImpl<BasicCampusMapper, Basic
         }else {
             // 新增
             campusId = SystemConstant.getDbUuid();
+            BasicCampus old = this.getById(campusId);
+            if (Objects.isNull(old) || old.getEnable().equals(false)){
+                throw ExceptionResultEnum.ERROR.exception("所选校区主键不存在或被禁用");
+            }
             BasicCampus basicCampus = new BasicCampus();
             basicCampus.setId(campusId);
             basicCampus.setCampusCode(campusCode);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicStudentServiceImpl.java

@@ -211,7 +211,7 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
             basicStudent.setSchoolId(schoolId);
 
             // 保存
-            if (Objects.isNull(id)){
+            if (!SystemConstant.longNotNull(id)){
                 // id为空 -> 新增
                 // 获取分布式id
                 id = SystemConstant.getDbUuid();
@@ -219,6 +219,10 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
                 basicStudent.setCreateId(sysUser.getId());
             }else {
                 // id不为空 -> 更新
+                BasicStudent old = this.getById(id);
+                if (Objects.isNull(old) || old.getEnable().equals(false)){
+                    throw ExceptionResultEnum.ERROR.exception("学生主键不存在或被禁用");
+                }
                 basicStudent.setId(id);
                 basicStudent.setUpdateId(sysUser.getId());
             }

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicCampusController.java

@@ -1,6 +1,8 @@
 package com.qmth.distributed.print.api;
 
 
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.params.BasicCampusParams;
 import com.qmth.distributed.print.business.bean.result.EditResult;
@@ -11,10 +13,7 @@ import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -30,6 +29,7 @@ import javax.validation.Valid;
 @Api(tags = "校区管理controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.basic}/campus")
+@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
 public class BasicCampusController {
     @Resource
     private BasicCampusService basicCampusService;
@@ -55,7 +55,7 @@ public class BasicCampusController {
     @ApiOperation(value = "校区管理-删除（逻辑）")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    public Result deleteBasicCampus(@ApiParam(value = "校区id",required = true) String id) {
+    public Result deleteBasicCampus(@ApiParam(value = "校区id",required = true) @RequestParam String id) {
         return ResultUtil.ok(basicCampusService.removeBasicCampusById(SystemConstant.convertIdToLong(id)));
     }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicCourseController.java

@@ -1,6 +1,8 @@
 package com.qmth.distributed.print.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.service.PrintCommonService;
@@ -37,6 +39,7 @@ import java.util.Objects;
 @Api(tags = "课程Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.basic}/course")
+@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
 public class BasicCourseController {
 
     @Resource
@@ -134,7 +137,7 @@ public class BasicCourseController {
     @ApiOperation(value = "课程管理-批量删除（逻辑）")
     @RequestMapping(value = "/delete_batch", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    public Result deleteBasicCampus(@ApiParam(value = "选择的要删除的学生id集合",required = true) List<Long> idList) {
+    public Result deleteBasicCampus(@ApiParam(value = "选择的要删除的课程id集合",required = true) @RequestParam List<Long> idList) {
         return ResultUtil.ok(basicCourseService.removeBasicCourseBatch(idList));
     }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicStudentController.java

@@ -1,11 +1,11 @@
 package com.qmth.distributed.print.api;
 
 
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.params.BasicCampusParams;
 import com.qmth.distributed.print.business.bean.params.BasicStudentParams;
 import com.qmth.distributed.print.business.bean.result.EditResult;
-import com.qmth.distributed.print.business.entity.BasicStudent;
 import com.qmth.distributed.print.business.service.BasicStudentService;
 import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.distributed.print.business.templete.execute.AsyncStudentDataImportService;
@@ -17,7 +17,6 @@ import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
-import org.junit.Test;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -39,6 +38,7 @@ import java.util.Objects;
 @Api(tags = "学生管理controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.basic}/student")
+@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
 public class BasicStudentController {
     @Resource
     private BasicStudentService basicStudentService;
@@ -70,7 +70,7 @@ public class BasicStudentController {
     @ApiOperation(value = "学生基本信息管理-批量删除（逻辑）")
     @RequestMapping(value = "/delete_batch", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    public Result deleteBasicCampus(@ApiParam(value = "选择的要删除的学生id集合",required = true) List<Long> idList) {
+    public Result deleteBasicCampus(@ApiParam(value = "选择的要删除的学生id集合",required = true) @RequestParam List<Long> idList) {
         return ResultUtil.ok(basicStudentService.removeBasicStudentBatch(idList));
     }
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicCourseServiceImpl.java

@@ -11,6 +11,7 @@ import com.qmth.teachcloud.common.bean.params.BasicCourseParams;
 import com.qmth.teachcloud.common.bean.result.BasicCourseResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicCourse;
+import com.qmth.teachcloud.common.entity.BasicUserCourse;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
@@ -138,6 +139,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
             throw ExceptionResultEnum.ERROR.exception("请选择要删除的目标");
         }
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        basicUserCourseService.remove(new QueryWrapper<BasicUserCourse>().lambda().in(BasicUserCourse::getCourseId,idList).eq(BasicUserCourse::getSchoolId,sysUser.getSchoolId()));
 
         UpdateWrapper<BasicCourse> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda()
@@ -235,6 +237,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
             basicCourse.setCode(courseCode);
             basicCourse.setTeachingRoomId(teachingRoomId);
             basicCourse.setSchoolId(schoolId);
+            basicCourse.setOrgId(sysUser.getOrgId());
 
             if (!SystemConstant.longNotNull(id)){
                 // 没有id -》新增
@@ -244,6 +247,10 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                 basicCourse.setEnable(true);
             }else {
                 // 有id -》 更新
+                BasicCourse old = this.getById(id);
+                if (Objects.isNull(old) || old.getEnable().equals(false)){
+                    throw ExceptionResultEnum.ERROR.exception("课程主键不存在或被禁用");
+                }
                 basicCourse.setId(id);
                 basicCourse.setUpdateId(sysUser.getId());
                 basicCourse.setOrgId(sysUser.getOrgId());

teachcloud-common/src/main/resources/mapper/BasicCourseMapper.xml

@@ -66,6 +66,7 @@
             MAX(org.name) AS teachingRoomName,
             GROUP_CONCAT(buc.clazz
                          SEPARATOR ',') AS clazz,
+            MAX(bc.enable) as enable,
             MAX(bc.create_id) AS createId,
             MAX(bc.create_time) AS createTime
         FROM