学校功能

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/IndexController.java

@@ -70,7 +70,7 @@ public class IndexController {
             LoginTokenModel tokenModel = (LoginTokenModel) result.getContent();
             response.setHeader("accessToken", tokenModel.getAccess_token());
             Cookie cookie = new Cookie("accessToken", tokenModel.getAccess_token());
-            cookie.setMaxAge(60 * 60 * 24 * 30);
+            cookie.setMaxAge(60 * 60 * 24 * 3);
             cookie.setPath("/");
             response.addCookie(cookie);
         }
@@ -88,7 +88,7 @@ public class IndexController {
             LoginPlatformTokenModel tokenModel = (LoginPlatformTokenModel) result.getContent();
             response.setHeader("accessToken", tokenModel.getAccess_token());
             Cookie cookie = new Cookie("accessToken", tokenModel.getAccess_token());
-            cookie.setMaxAge(60 * 60 * 24 * 30);
+            cookie.setMaxAge(60 * 60 * 24 * 3);
             cookie.setPath("/");
             response.addCookie(cookie);
         }
@@ -107,7 +107,7 @@ public class IndexController {
             LoginTokenModel tokenModel = (LoginTokenModel) result.getContent();
             response.setHeader("accessToken", tokenModel.getAccess_token());
             Cookie cookie = new Cookie("accessToken", tokenModel.getAccess_token());
-            cookie.setMaxAge(60 * 60 * 24 * 30);
+            cookie.setMaxAge(60 * 60 * 24 * 3);
             cookie.setPath("/");
             response.addCookie(cookie);
         }
@@ -122,7 +122,7 @@ public class IndexController {
             UserTokenModel tokenModel = (UserTokenModel) result.getContent();
             response.setHeader("accessToken", tokenModel.getAccessToken());
             Cookie cookie = new Cookie("accessToken", String.valueOf(tokenModel.getExpireTime()));
-            cookie.setMaxAge(60 * 60 * 24 * 30);
+            cookie.setMaxAge(60 * 60 * 24 * 3);
             cookie.setPath("/");
             response.addCookie(cookie);
         }

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

@@ -47,6 +47,12 @@ public class SchoolUserController {
     @Autowired
     UserAccountService userAccountService;
 
+    @Operation(summary = "注册用户c端用户（包含卡片信息）", description = "注册用户c端用户")
+    @RequestMapping(value = {"registerUser"}, method = {RequestMethod.POST})
+    public ResultContent<SchoolUserModel> registerUser(@RequestBody RegisterUserParam param) {
+        return schoolUserService.register(param);
+    }
+
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "importSchoolUsers", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, method = RequestMethod.POST)
     @Operation(summary = "导入校园用户", description = "导入校园用户")
@@ -91,12 +97,6 @@ public class SchoolUserController {
         return schoolUserService.deleteUser(param.getId());
     }
 
-    @Operation(summary = "注册用户c端用户（包含卡片信息）", description = "注册用户c端用户")
-    @RequestMapping(value = {"registerUser"}, method = {RequestMethod.POST})
-    public ResultContent<SchoolUserModel> registerUser(@RequestBody RegisterUserParam param) {
-        return schoolUserService.register(param);
-    }
-
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "得到校园用户详情（包含卡片信息）", description = "得到用户详情")
     @RequestMapping(value = {"getSchoolUserDetail"}, method = {RequestMethod.POST})

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationServiceImpl.java

@@ -675,7 +675,7 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
 
             // 区域信息
             String adminDivisionItemCode = entity.getAdminDivisionItemCode();
-            if (StringUtils.isEmpty(adminDivisionItemCode)) {
+            if (StringUtils.isNotEmpty(adminDivisionItemCode)) {
                 List<String> codes = List.of(adminDivisionItemCode.split(","));
                 List<Region> regions = regionDao.findByCodeIn(codes);
                 List<RegionModel> regionList = regions.stream().map(it -> {

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

@@ -251,6 +251,23 @@ public class SchoolUserServiceImpl extends SuperService implements SchoolUserSer
         if (!ValidateUtils.isPhoneNumber(phone)) {
             return ResultContent.buildFail("电话号码格式不正确");
         }
+        // 保存卡片信息
+        List<CardInfoParam> cardInfos = param.getCardInfos();
+
+        HashMap<String, String> map = new HashMap<>();
+        for (CardInfoParam cardInfo : cardInfos) {
+            if (cardInfo.getCardType() == null) {
+                return ResultContent.buildFail("卡片类型不能为空");
+            }
+            if (StringUtils.isEmpty(cardInfo.getIccid())) {
+                return ResultContent.buildFail("iccid不能为空");
+            }
+            if (map.containsKey(cardInfo.getIccid())) {
+                return ResultContent.buildFail(String.format("iccid已存在：%s", cardInfo.getIccid()));
+            }
+            map.put(cardInfo.getIccid(), cardInfo.getIccid());
+        }
+
         UserAccount userAccount = userCountDao.findTopByLoginName(phone);
         if (ObjectUtils.isNotEmpty(userAccount)) {
             return ResultContent.buildFail(String.format("登录名已存在：%s", phone));
@@ -267,8 +284,6 @@ public class SchoolUserServiceImpl extends SuperService implements SchoolUserSer
             return ResultContent.buildFail(resultContent.getMsg());
         }
         String userId = resultContent.getContent();
-        // 保存卡片信息
-        List<CardInfoParam> cardInfos = param.getCardInfos();
         if (ObjectUtils.isNotEmpty(cardInfos)) {
             for (CardInfoParam cardInfo : cardInfos) {
                 cardInfo.setUserId(userId);