瀏覽代碼

更新!

TRX 1 年之前
父節點
當前提交
ca7bfa0a04

+ 64 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/register/UserCountRegisterParam.java

@@ -0,0 +1,64 @@
+package com.zhongshu.card.client.model.org.register;
+
+import com.zhongshu.card.client.type.CertificateType;
+import com.zhongshu.card.client.type.OrganizationUserType;
+import com.zhongshu.card.client.type.Sex;
+import com.zhongshu.card.client.type.UserState;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author TRX
+ * @date 2024/5/31
+ */
+@Data
+public class UserCountRegisterParam {
+
+    @Schema(description = "用户手机号")
+    private String phone;
+
+    @Schema(description = "编码")
+    private String code;
+
+    @Schema(description = "姓名")
+    private String name;
+
+    @Schema(description = "头像")
+    private String profilePic;
+
+    @Schema(description = "性别")
+    private Sex sex;
+
+    @Schema(description = "地址")
+    private String address;
+
+    @Schema(description = "证件类型")
+    private CertificateType certificateType = CertificateType.IDCard;
+
+    @Schema(description = "证件号码")
+    private String cardNumber;
+
+    @Schema(description = "职位")
+    private String positionId;
+
+    @Schema(description = "用户在机构的类型")
+    private OrganizationUserType userType = OrganizationUserType.Teacher;
+
+    @Schema(description = "用户状态")
+    private UserState state = UserState.Normal;
+
+    @Schema(description = "部门信息")
+    private String departmentId;
+
+    @Schema(description = "角色信息-人员类型")
+    private List<String> roleIds;
+
+    @Schema(description = "密码")
+    private String passWord;
+
+    @Schema(description = "是否是管理员")
+    private Boolean isAdmin = Boolean.FALSE;
+
+}

+ 1 - 1
FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/projectCommon/ProjectCommonConfigParam.java

@@ -79,6 +79,6 @@ public class ProjectCommonConfigParam extends ProjectCommonSuperParam {
     private Integer maxFaceNumber = 3;
 
     @Schema(description = "照片大小限制")
-    private BigDecimal maxSize = BigDecimal.valueOf(2);
+    private BigDecimal maxSize = BigDecimal.valueOf(5);
 
 }

+ 7 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/visitor/VisitorSettingController.java

@@ -3,7 +3,7 @@ package com.zhongshu.card.server.core.controller.visitor;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.card.client.model.base.IDParam;
+import com.zhongshu.card.client.model.base.CodeParam;
 import com.zhongshu.card.client.model.visitor.setting.VisitorSettingModel;
 import com.zhongshu.card.client.model.visitor.setting.VisitorSettingParam;
 import com.zhongshu.card.server.core.service.visitor.VisitorSettingService;
@@ -37,6 +37,12 @@ public class VisitorSettingController {
         return visitorSettingService.getInfo(param.getSceneComponentId(), param.getProjectOid());
     }
 
+    @Operation(summary = "得到配置(传入组件code)", description = "得到配置")
+    @RequestMapping(value = "getInfoByCode", method = {RequestMethod.POST})
+    public ResultContent<VisitorSettingModel> getInfoByCode(@RequestBody CodeParam param) {
+        return visitorSettingService.getInfoByCode(param.getCode(), param.getProjectOid());
+    }
+
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "保存配置", description = "保存配置")
     @RequestMapping(value = "saveInfo", method = {RequestMethod.POST})

+ 2 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/scene/SceneComponentDao.java

@@ -9,6 +9,8 @@ public interface SceneComponentDao extends MongoDao<SceneComponent> {
 
     SceneComponent findTopById(String id);
 
+    SceneComponent findTopByCode(String code);
+
     List<SceneComponent> findBySceneInfoIdOrderBySortAsc(String sceneInfoId);
 
     long deleteByIdIn(List<String> ids);

+ 2 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationUserServiceImpl.java

@@ -220,6 +220,8 @@ public class OrganizationUserServiceImpl extends SuperService {
         return ResultContent.buildSuccess(organizationUser);
     }
 
+
+
     /**
      * 机构绑定用户 (角色、部门、职位都以新的为准)
      * 用户基本信息已存在

+ 14 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/visitor/VisitorSettingService.java

@@ -80,6 +80,20 @@ public class VisitorSettingService extends SuperService {
         return ResultContent.buildSuccess();
     }
 
+    public ResultContent<VisitorSettingModel> getInfoByCode(String code, String projectOid) {
+        if (StringUtils.isEmpty(projectOid)) {
+            projectOid = getCurrentProjectOid();
+        }
+        if (StringUtils.isEmpty(projectOid)) {
+            return ResultContent.buildFail("projectOid 信息为空");
+        }
+        SceneComponent sceneComponent = sceneComponentDao.findTopByCode(code);
+        if (ObjectUtils.isEmpty(sceneComponent)) {
+            return ResultContent.buildFail(String.format("组件不存在:%s", code));
+        }
+        return getInfo(sceneComponent.getSceneInfoId(), projectOid);
+    }
+
     /**
      * 得到组件访客配置
      *