学校功能

FullCardClient/src/main/java/com/zhongshu/card/client/model/base/IDsParam.java

@@ -0,0 +1,16 @@
+package com.zhongshu.card.client.model.base;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author TRX
+ * @date 2024/6/13
+ */
+@Data
+public class IDsParam {
+    @Schema(description = "id集合")
+    private List<String> ids;
+}

FullCardClient/src/main/java/com/zhongshu/card/client/service/school/AreaService.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.service.school;
 
+import com.zhongshu.card.client.model.base.IDsParam;
 import com.zhongshu.card.client.model.school.AreaParam;
-import com.zhongshu.card.client.model.school.CollegeParam;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.utils.ITree;
 
@@ -20,4 +20,7 @@ public interface AreaService {
     // 删除
     ResultContent deleteArea(String id);
 
+    // 删除多个
+    ResultContent deleteAreas(IDsParam param);
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/AreaController.java

@@ -0,0 +1,55 @@
+package com.zhongshu.card.server.core.controller.school;
+
+import com.github.microservice.auth.security.annotations.ResourceAuth;
+import com.github.microservice.auth.security.type.AuthType;
+import com.zhongshu.card.client.model.base.IDParam;
+import com.zhongshu.card.client.model.base.IDsParam;
+import com.zhongshu.card.client.model.base.OidModel;
+import com.zhongshu.card.client.model.school.AreaParam;
+import com.zhongshu.card.client.ret.ResultContent;
+import com.zhongshu.card.client.service.school.AreaService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+@RestController
+@RequestMapping("/school/area")
+@Tag(name = "学校-区域管理")
+public class AreaController {
+
+    @Autowired
+    AreaService areaService;
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "添加-编辑区域-通用", description = "添加-编辑区域")
+    @RequestMapping(value = "addArea", method = {RequestMethod.POST})
+    public ResultContent addArea(@RequestBody AreaParam param) {
+        return this.areaService.addArea(param);
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "得到机构区域树-通用", description = "得到机构区域树")
+    @RequestMapping(value = "getAreaTree", method = {RequestMethod.POST})
+    public ResultContent getAreaTree(@RequestBody OidModel param) {
+        return this.areaService.getAreaTree(param.getOid());
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "删除区域-通用", description = "删除区域")
+    @RequestMapping(value = "deleteArea", method = {RequestMethod.POST})
+    public ResultContent deleteArea(@RequestBody IDParam param) {
+        return this.areaService.deleteArea(param.getId());
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "删除区域(多个)-通用", description = "删除区域(多个)")
+    @RequestMapping(value = "deleteAreas", method = {RequestMethod.POST})
+    public ResultContent deleteAreas(@RequestBody IDsParam param) {
+        return this.areaService.deleteAreas(param);
+    }
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/AreaServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.server.core.service.school;
 
+import com.zhongshu.card.client.model.base.IDsParam;
 import com.zhongshu.card.client.model.school.AreaModel;
 import com.zhongshu.card.client.model.school.AreaParam;
 import com.zhongshu.card.client.model.school.DictInfoParam;
@@ -10,10 +11,8 @@ import com.zhongshu.card.client.utils.ITree;
 import com.zhongshu.card.client.utils.TreeUtil;
 import com.zhongshu.card.client.utils.type.DataState;
 import com.zhongshu.card.server.core.dao.school.AreaDao;
-import com.zhongshu.card.server.core.dao.school.CollegeDao;
 import com.zhongshu.card.server.core.dao.school.DictInfoDao;
 import com.zhongshu.card.server.core.domain.school.Area;
-import com.zhongshu.card.server.core.domain.school.College;
 import com.zhongshu.card.server.core.domain.school.DictInfo;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.util.BeanUtils;
@@ -115,6 +114,25 @@ public class AreaServiceImpl extends SuperService implements AreaService {
         return ResultContent.buildSuccess();
     }
 
+    /**
+     * 删除多个
+     *
+     * @param param
+     * @return
+     */
+    public ResultContent deleteAreas(IDsParam param) {
+        if (ObjectUtils.isEmpty(param.getIds())) {
+            return ResultContent.buildFail("ids不能为空");
+        }
+        for (String id : param.getIds()) {
+            ResultContent resultContent = deleteArea(id);
+            if (resultContent.isFailed()) {
+                return resultContent;
+            }
+        }
+        return ResultContent.buildSuccess();
+    }
+
     /**
      * 得到所有信息 (树形结构)
      *