diff --git a/esua-epdc/doc/db/dev_youhua/esua_epdc_user.sql b/esua-epdc/doc/db/dev_youhua/esua_epdc_user.sql index 92a1de9dd..db8f63d20 100644 --- a/esua-epdc/doc/db/dev_youhua/esua_epdc_user.sql +++ b/esua-epdc/doc/db/dev_youhua/esua_epdc_user.sql @@ -1,7 +1,8 @@ +--------标记一下这个已经随工作端上线 ALTER TABLE esua_epdc_user.epdc_party_authentication_failed MODIFY COLUMN `STATE` VARCHAR(1) NULL COMMENT '状态 0-认证失败'; ALTER TABLE esua_epdc_user.epdc_party_authentication_failed MODIFY COLUMN `CADRE_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 0 NULL COMMENT '干部下沉标识 0-否，1-是'; ALTER TABLE esua_epdc_user.epdc_user_authenticate_history ADD AUTHENTICATED_TYPE varchar(2) NOT NULL COMMENT '认证类别(0-居民认证，1-党员认证，2-志愿者认证)'; - +------------------------------------------------ CREATE TABLE `epdc_handle_category` ( `ID` varchar(32) NOT NULL COMMENT '主键', diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 2c0340f30..007336a83 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -496,7 +496,7 @@ public class UserServiceImpl extends BaseServiceImpl implem if (selectCount > NumConstant.ZERO) { return new Result().error("手机号已被注册"); } - //党员都需要查重 + //党员都需要查重 if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { userWrapper = new QueryWrapper<>(); userWrapper.eq(UserFieldConsant.IDENTITY_NO, userDto.getIdentityNo()) @@ -679,9 +679,10 @@ public class UserServiceImpl extends BaseServiceImpl implem * @author rongchao * @since 2019-12-19 */ - private void authPartyMembers(EpdcAppUserCompleteInfoFormDTO formDto, ParentAndAllDeptDTO parentAndAllDeptDTO) { + private boolean authPartyMembers(EpdcAppUserCompleteInfoFormDTO formDto, ParentAndAllDeptDTO parentAndAllDeptDTO) { EpdcCompleteAppUserDTO completeAppUser = formDto.getCompleteAppUser(); UserGridRelationDTO userGridRelation = formDto.getUserGridRelation(); + boolean result = Boolean.FALSE; int selectCount = partyMembersService.countPartyMemberByIdNoAndRealName(completeAppUser.getIdentityNo(), completeAppUser.getRealName()); if (selectCount == NumConstant.ZERO) { // 党员认证失败 @@ -696,7 +697,9 @@ public class UserServiceImpl extends BaseServiceImpl implem generateUserTag(completeAppUser.getId()); // 生成党员认证通过记录 generateUserAuthenticateHistory(completeAppUser, UserAuthTypeEnum.PARTY_AUTH, YesOrNoEnum.YES, null); + result = Boolean.TRUE; } + return result; } @Override @@ -711,15 +714,20 @@ public class UserServiceImpl extends BaseServiceImpl implem //进行居民认证 UserEntity userEntity = modifyResidentInfo(completeAppUser, userGridRelation, parentAndAllDeptDTO); - if (YesOrNoEnum.YES.value().equals(completeAppUser.getPartyFlag())) { - //进行党员认证 - authPartyMembers(formDto, parentAndAllDeptDTO); - } - //返回网格长标识信息 UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(completeAppUser.getId(), userGridRelation.getGridId()); UserDTO userDTO = ConvertUtils.sourceToTarget(userEntity, UserDTO.class); userDTO.setLeaderFlag(relationInfo.getLeaderFlag()); + + if (YesOrNoEnum.YES.value().equals(completeAppUser.getPartyFlag())) { + //进行党员认证 + boolean authFlag = authPartyMembers(formDto, parentAndAllDeptDTO); + //认证成功党员 信息审核通过 + if (authFlag) { + userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value()); + userDTO.setRegisterTime(new Date());// 认证成功之后更新认证时间 + } + } return new Result().ok(userDTO); } diff --git a/esua-epdc/k8s/kongcun/app-master/nfs/nfs-deployment.yml b/esua-epdc/k8s/kongcun/app-master/nfs/nfs-deployment.yml index 083d5c4f5..0b2efd137 100644 --- a/esua-epdc/k8s/kongcun/app-master/nfs/nfs-deployment.yml +++ b/esua-epdc/k8s/kongcun/app-master/nfs/nfs-deployment.yml @@ -1,10 +1,3 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: nfs-client-provisioner - ---- - kind: Deployment apiVersion: apps/v1 metadata: @@ -21,22 +14,22 @@ spec: labels: app: nfs-client-provisioner spec: - serviceAccount: nfs-client-provisioner + serviceAccountName: nfs-client-provisioner containers: - - name: nfs-client-provisioner - image: quay.io/external_storage/nfs-client-provisioner:latest - volumeMounts: - - name: nfs-client-root - mountPath: /persistentvolumes - env: - - name: PROVISIONER_NAME - value: fuseim.pri/ifs - - name: NFS_SERVER - value: 172.16.0.7 - - name: NFS_PATH - value: /mnt/nfs/data + - name: nfs-client-provisioner + image: quay.io/external_storage/nfs-client-provisioner:latest + volumeMounts: + - name: nfs-client-root + mountPath: /persistentvolumes + env: + - name: PROVISIONER_NAME + value: fuseim.pri/ifs + - name: NFS_SERVER + value: 172.16.0.8 + - name: NFS_PATH + value: /mnt/nfs/data volumes: - - name: nfs-client-root - nfs: - server: 172.16.0.7 - path: /mnt/nfs/data + - name: nfs-client-root + nfs: + server: 172.16.0.8 + path: /mnt/nfs/data diff --git a/esua-epdc/k8s/kongcun/app-master/nfs/nfs-rbac.yml b/esua-epdc/k8s/kongcun/app-master/nfs/nfs-rbac.yml index d39a3b088..92c1e4718 100644 --- a/esua-epdc/k8s/kongcun/app-master/nfs/nfs-rbac.yml +++ b/esua-epdc/k8s/kongcun/app-master/nfs/nfs-rbac.yml @@ -1,3 +1,10 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: nfs-client-provisioner + +--- + kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -9,15 +16,15 @@ rules: - apiGroups: [""] resources: ["persistentvolumeclaims"] verbs: ["get", "list", "watch", "update"] - - apiGroups: [""] - resources: ["endpoints"] - verbs: ["get", "list", "watch", "create", "update", "patch"] - apiGroups: ["storage.k8s.io"] resources: ["storageclasses"] verbs: ["get", "list", "watch"] - apiGroups: [""] resources: ["events"] - verbs: ["create", "update", "patch"] + verbs: ["list", "watch", "create", "update", "patch"] + - apiGroups: [""] + resources: ["endpoints"] + verbs: ["create", "delete", "get", "list", "watch", "patch", "update"] --- @@ -33,29 +40,3 @@ roleRef: kind: ClusterRole name: nfs-client-provisioner-runner apiGroup: rbac.authorization.k8s.io - ---- - -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: leader-locking-nfs-client-provisioner -rules: - - apiGroups: [""] - resources: ["endpoints"] - verbs: ["get", "list", "watch", "create", "update", "patch"] - ---- - -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: leader-locking-nfs-client-provisioner -subjects: - - kind: ServiceAccount - name: nfs-client-provisioner - # replace with namespace where provisioner is deployed -roleRef: - kind: Role - name: leader-locking-nfs-client-provisioner - apiGroup: rbac.authorization.k8s.io diff --git a/esua-epdc/k8s/kongcun/app-master/nfs/storageclass-nfs.yml b/esua-epdc/k8s/kongcun/app-master/nfs/storageclass-nfs.yml index 2c81f17b1..d20235804 100644 --- a/esua-epdc/k8s/kongcun/app-master/nfs/storageclass-nfs.yml +++ b/esua-epdc/k8s/kongcun/app-master/nfs/storageclass-nfs.yml @@ -1,7 +1,5 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: - name: managed-nfs-storage -provisioner: fuseim.pri/ifs -parameters: - archiveOnDelete: "false" + name: course-nfs-storage +provisioner: fuseim.pri/ifs # or choose another name, must match deployment's env PROVISIONER_NAME'