更新

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/ImportUserModel.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/school/ImportResultModel.java

@@ -14,7 +14,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class ImportUserModel {
+public class ImportResultModel {
     @Schema(description = "导入总条数")
     private Integer total;
 

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

@@ -4,7 +4,7 @@ import com.zhongshu.card.client.model.org.OrgUserDetailParam;
 import com.zhongshu.card.client.model.org.OrganizationUserSearch;
 import com.zhongshu.card.client.model.org.SchoolUserCountParam;
 import com.zhongshu.card.client.model.school.CardInfoModel;
-import com.zhongshu.card.client.model.school.ImportUserModel;
+import com.zhongshu.card.client.model.school.ImportResultModel;
 import com.zhongshu.card.client.model.school.RegisterUserParam;
 import com.zhongshu.card.client.model.school.SchoolUserModel;
 import com.zhongshu.card.client.ret.ResultContent;
@@ -20,7 +20,7 @@ import java.util.List;
  */
 public interface SchoolUserService {
 
-    ResultContent<ImportUserModel> importSchoolUsers(HttpServletRequest request,
+    ResultContent<ImportResultModel> importSchoolUsers(HttpServletRequest request,
             HttpServletResponse response, MultipartFile file);
 
     void exportSchoolUser(HttpServletRequest request, HttpServletResponse response,

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

@@ -4,7 +4,6 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.IDParam;
-import com.zhongshu.card.client.model.org.OrgUserDetailParam;
 import com.zhongshu.card.client.model.school.*;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.service.school.CardInfoService;
@@ -87,7 +86,7 @@ public class CardInfoPoolController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "importCardPool", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, method = RequestMethod.POST)
     @Operation(summary = "园区卡池导入", description = "园区卡池导入")
-    public ResultContent<ImportUserModel> importCardPool(HttpServletRequest request,
+    public ResultContent<ImportResultModel> importCardPool(HttpServletRequest request,
             HttpServletResponse response,
             @RequestPart("file") MultipartFile file) throws IOException {
         if (file == null || file.isEmpty()) {

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

@@ -7,8 +7,7 @@ import com.zhongshu.card.client.model.org.OrgUserDetailParam;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;
 import com.zhongshu.card.client.model.org.OrganizationUserSearch;
 import com.zhongshu.card.client.model.org.SchoolUserCountParam;
-import com.zhongshu.card.client.model.school.FileParam;
-import com.zhongshu.card.client.model.school.ImportUserModel;
+import com.zhongshu.card.client.model.school.ImportResultModel;
 import com.zhongshu.card.client.model.school.RegisterUserParam;
 import com.zhongshu.card.client.model.school.SchoolUserModel;
 import com.zhongshu.card.client.ret.ResultContent;
@@ -19,14 +18,11 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -56,7 +52,7 @@ public class SchoolUserController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "importSchoolUsers", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, method = RequestMethod.POST)
     @Operation(summary = "导入校园用户", description = "导入校园用户")
-    public ResultContent<ImportUserModel> importSchoolUsers(HttpServletRequest request,
+    public ResultContent<ImportResultModel> importSchoolUsers(HttpServletRequest request,
             HttpServletResponse response,
             @RequestPart("file") MultipartFile file) throws IOException {
         if (file == null || file.isEmpty()) {

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

@@ -2,17 +2,14 @@ package com.zhongshu.card.server.core.service.school;
 
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
-import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.zhongshu.card.client.model.org.OidAboutInfo;
-import com.zhongshu.card.client.model.org.ProjectOrgModel;
 import com.zhongshu.card.client.model.school.*;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.ret.ResultMessage;
 import com.zhongshu.card.client.utils.type.school.CardType;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.school.CardInfoPoolDao;
-import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.school.CardInfoPool;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.org.OrganizationServiceImpl;
@@ -159,7 +156,7 @@ public class CardInfoPoolService extends SuperService {
      * @param file
      * @return
      */
-    public ResultContent<ImportUserModel> importCardPool(HttpServletRequest request,
+    public ResultContent<ImportResultModel> importCardPool(HttpServletRequest request,
             HttpServletResponse response, MultipartFile file) {
         String oid = getCurrentOid();
         Assert.hasText(oid, "oid不能为空");
@@ -169,7 +166,7 @@ public class CardInfoPoolService extends SuperService {
         String projectOid = oidAboutInfo.getProjectOid();
         String schoolOid = oidAboutInfo.getSchoolOid();
 
-        ImportUserModel model = new ImportUserModel();
+        ImportResultModel model = new ImportResultModel();
         try {
             int startRow = 2;
             ImportParams params = new ImportParams();

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

@@ -79,12 +79,12 @@ public class SchoolUserServiceImpl extends SuperService implements SchoolUserSer
      * @return
      */
     @Override
-    public ResultContent<ImportUserModel> importSchoolUsers(HttpServletRequest request,
+    public ResultContent<ImportResultModel> importSchoolUsers(HttpServletRequest request,
             HttpServletResponse response, MultipartFile file) {
         String oid = getCurrentOid();
         Assert.hasText(oid, "oid不能为空");
 
-        ImportUserModel model = new ImportUserModel();
+        ImportResultModel model = new ImportResultModel();
         try {
             int startRow = 2;
             ImportParams params = new ImportParams();