优化用户和人员信息同步

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-controller/src/main/java/org/hswebframework/web/controller/organizational/PersonController.java

@@ -50,4 +50,6 @@ public class PersonController implements GenericEntityController<PersonEntity, S
     public PersonService getService() {
         return personService;
     }
+
+
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/hsweb-system-organizational-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/organizational/PersonMapper.xml

@@ -21,14 +21,14 @@
 <mapper namespace="org.hswebframework.web.dao.organizational.PersonDao">
     <resultMap id="PersonResultMap" type="org.hswebframework.web.entity.organizational.SimplePersonEntity">
         <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
-            <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
-            <result property="sex" column="sex" javaType="Byte" jdbcType="DECIMAL"/>
-            <result property="email" column="email" javaType="String" jdbcType="VARCHAR"/>
-            <result property="phone" column="phone" javaType="String" jdbcType="VARCHAR"/>
-            <result property="photo" column="photo" javaType="String" jdbcType="VARCHAR"/>
-            <result property="userId" column="user_id" javaType="String" jdbcType="VARCHAR"/>
-            <result property="status" column="status" javaType="Byte" jdbcType="DECIMAL"/>
-            <result property="remark" column="remark" javaType="String" jdbcType="VARCHAR"/>
+        <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
+        <result property="sex" column="sex" javaType="Byte" jdbcType="DECIMAL"/>
+        <result property="email" column="email" javaType="String" jdbcType="VARCHAR"/>
+        <result property="phone" column="phone" javaType="String" jdbcType="VARCHAR"/>
+        <result property="photo" column="photo" javaType="String" jdbcType="VARCHAR"/>
+        <result property="userId" column="user_id" javaType="String" jdbcType="VARCHAR"/>
+        <result property="status" column="status" javaType="Byte" jdbcType="DECIMAL"/>
+        <result property="remark" column="remark" javaType="String" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--用于动态生成sql所需的配置-->
@@ -36,8 +36,8 @@
         <bind name="resultMapId" value="'PersonResultMap'"/>
         <bind name="tableName" value="'s_person'"/>
     </sql>
-  
-    <insert id="insert" parameterType="org.hswebframework.web.entity.organizational.SimplePersonEntity" >
+
+    <insert id="insert" parameterType="org.hswebframework.web.entity.organizational.SimplePersonEntity">
         <include refid="config"/>
         <include refid="BasicMapper.buildInsertSql"/>
     </insert>

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/PersonUserBindEntity.java

@@ -18,11 +18,20 @@
 
 package org.hswebframework.web.entity.organizational;
 
+import java.util.Set;
+
 /**
  * TODO 完成注释
  *
  * @author zhouhao
  */
-public interface PersonUserBindEntity extends PersonEntity {
+public interface PersonAuthBindEntity extends PersonEntity {
+    PersonUserEntity getPersonUser();
+
+    void setPersonUser(PersonUserEntity personUser);
+
+    Set<String> getPositionIds();
+
+    void setPositionIds(Set<String> positionIds);
 
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/PersonEntity.java

@@ -142,8 +142,4 @@ public interface PersonEntity extends GenericEntity<String> {
      */
     void setRemark(String remark);
 
-    Set<String> getPositionIds();
-
-    void setPositionIds(Set<String> positionIds);
-
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/PersonUserEntity.java

@@ -0,0 +1,30 @@
+package org.hswebframework.web.entity.organizational;
+
+import org.hswebframework.web.commons.entity.Entity;
+
+/**
+ * TODO 完成注释
+ *
+ * @author zhouhao
+ */
+public class PersonUserEntity implements Entity {
+    private String username;
+
+    private String password;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/SimplePersonAuthBindEntity.java

@@ -0,0 +1,34 @@
+package org.hswebframework.web.entity.organizational;
+
+import java.util.Set;
+
+/**
+ * TODO 完成注释
+ *
+ * @author zhouhao
+ */
+public class SimplePersonAuthBindEntity extends SimplePersonEntity implements PersonAuthBindEntity {
+    private PersonUserEntity personUser;
+    //职务ID集合
+    private Set<String>      positionIds;
+
+    @Override
+    public PersonUserEntity getPersonUser() {
+        return personUser;
+    }
+
+    @Override
+    public void setPersonUser(PersonUserEntity personUser) {
+        this.personUser = personUser;
+    }
+
+    @Override
+    public Set<String> getPositionIds() {
+        return positionIds;
+    }
+
+    @Override
+    public void setPositionIds(Set<String> positionIds) {
+        this.positionIds = positionIds;
+    }
+}

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/SimplePersonEntity.java

@@ -47,8 +47,6 @@ public class SimplePersonEntity extends SimpleGenericEntity<String> implements P
     //备注
     private String remark;
 
-    private Set<String> positionIds;
-
     /**
      * @return 姓名
      */
@@ -161,13 +159,4 @@ public class SimplePersonEntity extends SimpleGenericEntity<String> implements P
         this.remark = remark;
     }
 
-    @Override
-    public Set<String> getPositionIds() {
-        return positionIds;
-    }
-
-    @Override
-    public void setPositionIds(Set<String> positionIds) {
-        this.positionIds = positionIds;
-    }
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-api/src/main/java/org/hswebframework/web/service/organizational/PersonService.java

@@ -16,14 +16,20 @@
  */
 package org.hswebframework.web.service.organizational;
 
+import org.hswebframework.web.entity.organizational.PersonAuthBindEntity;
 import org.hswebframework.web.entity.organizational.PersonEntity;
 import org.hswebframework.web.service.CrudService;
 
 /**
- *  人员 服务类
+ * 人员 服务类
  *
  * @author hsweb-generator-online
  */
 public interface PersonService extends CrudService<PersonEntity, String> {
 
+    String insert(PersonAuthBindEntity authBindEntity);
+
+    int updateByPk(PersonAuthBindEntity authBindEntity);
+
+    PersonAuthBindEntity selectAuthBindByPk(String id);
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/pom.xml

@@ -44,5 +44,11 @@
             <artifactId>hsweb-system-organizational-authorization</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.hswebframework.web</groupId>
+            <artifactId>hsweb-system-authorization-service-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java

@@ -19,6 +19,8 @@ package org.hswebframework.web.service.organizational.simple;
 import org.hswebframework.web.commons.entity.TreeSupportEntity;
 import org.hswebframework.web.dao.dynamic.QueryByEntityDao;
 import org.hswebframework.web.dao.organizational.*;
+import org.hswebframework.web.entity.authorization.UserEntity;
+import org.hswebframework.web.entity.authorization.bind.BindRoleUserEntity;
 import org.hswebframework.web.entity.organizational.*;
 import org.hswebframework.web.id.IDGenerator;
 import org.hswebframework.web.organizational.authorization.PersonnelAuthorization;
@@ -28,23 +30,27 @@ import org.hswebframework.web.organizational.authorization.simple.SimplePersonne
 import org.hswebframework.web.organizational.authorization.simple.SimplePersonnelAuthorization;
 import org.hswebframework.web.service.DefaultDSLQueryService;
 import org.hswebframework.web.service.EnableCacheGernericEntityService;
-import org.hswebframework.web.service.GenericEntityService;
+import org.hswebframework.web.service.authorization.UserService;
 import org.hswebframework.web.service.organizational.PersonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import static org.hswebframework.web.service.DefaultDSLQueryService.*;
+import static org.springframework.util.StringUtils.*;
+
 /**
  * 默认的服务实现
  *
@@ -69,6 +75,9 @@ public class SimplePersonService extends EnableCacheGernericEntityService<Person
     @Autowired
     private OrganizationalDao organizationalDao;
 
+    @Autowired(required = false)
+    private UserService userService;
+
     @Override
     protected IDGenerator<String> getIDGenerator() {
         return IDGenerator.MD5;
@@ -80,14 +89,62 @@ public class SimplePersonService extends EnableCacheGernericEntityService<Person
     }
 
     @Override
-    public String insert(PersonEntity entity) {
-        String id = super.insert(entity);
-        if (entity.getPositionIds() != null) {
-            syncPositionInfo(id, entity.getPositionIds());
+    @CacheEvict(allEntries = true)
+    public String insert(PersonAuthBindEntity authBindEntity) {
+        // TODO: 17-6-1 应该使用锁,防止并发同步用户,导致多个人员使用相同的用户
+        if (authBindEntity.getPersonUser() != null) {
+            syncUserInfo(authBindEntity);
+        }
+        String id = this.insert(((PersonEntity) authBindEntity));
+        if (authBindEntity.getPositionIds() != null) {
+            syncPositionInfo(id, authBindEntity.getPositionIds());
         }
         return id;
     }
 
+    @Override
+    @CacheEvict(allEntries = true)
+    public int updateByPk(PersonAuthBindEntity authBindEntity) {
+        // TODO: 17-6-1 应该使用锁,防止并发同步用户,导致多个人员使用相同的用户
+        if (authBindEntity.getPositionIds() != null) {
+            personPositionDao.deleteByPersonId(authBindEntity.getId());
+            syncPositionInfo(authBindEntity.getId(), authBindEntity.getPositionIds());
+        }
+        if (authBindEntity.getPersonUser() != null) {
+            syncUserInfo(authBindEntity);
+        }
+        return this.updateByPk(((PersonEntity) authBindEntity));
+    }
+
+    @Override
+    @Cacheable(key = "'auth-bind'+#id")
+    public PersonAuthBindEntity selectAuthBindByPk(String id) {
+        PersonEntity personEntity = this.selectByPk(id);
+        if (personEntity == null) return null;
+
+        if (personEntity instanceof PersonAuthBindEntity) return ((PersonAuthBindEntity) personEntity);
+
+        PersonAuthBindEntity bindEntity = entityFactory.newInstance(PersonAuthBindEntity.class);
+        entityFactory.copyProperties(personEntity, bindEntity);
+        Set<String> positionIds = DefaultDSLQueryService.createQuery(personPositionDao)
+                .where(PersonPositionEntity.personId, id)
+                .list().stream()
+                .map(PersonPositionEntity::getPositionId)
+                .collect(Collectors.toSet());
+
+        bindEntity.setPositionIds(positionIds);
+
+        if (null != userService) {
+            UserEntity userEntity = userService.selectByPk(bindEntity.getUserId());
+            if (null != userEntity) {
+                PersonUserEntity entity = entityFactory.newInstance(PersonUserEntity.class);
+                entity.setUsername(userEntity.getUsername());
+                bindEntity.setPersonUser(entity);
+            }
+        }
+        return bindEntity;
+    }
+
     protected void syncPositionInfo(String personId, Set<String> positionIds) {
         for (String positionId : positionIds) {
             PersonPositionEntity positionEntity = entityFactory.newInstance(PersonPositionEntity.class);
@@ -97,16 +154,55 @@ public class SimplePersonService extends EnableCacheGernericEntityService<Person
         }
     }
 
-    @Override
-    protected int updateByPk(PersonEntity entity) {
-        int size = super.updateByPk(entity);
-        if (entity.getPositionIds() != null) {
-            personPositionDao.deleteByPersonId(entity.getId());
-            syncPositionInfo(entity.getId(), entity.getPositionIds());
+    protected void syncUserInfo(PersonAuthBindEntity bindEntity) {
+        if (isEmpty(bindEntity.getPersonUser().getUsername())) return;
+        //获取所有职位
+        Set<String> positionIds = bindEntity.getPositionIds();
+        if (positionIds.isEmpty()) return;
+        //是否使用了权限管理的userService.
+        if (null == userService) {
+            logger.warn("userService not ready!");
+            return;
+        }
+        //获取职位实体
+        List<PositionEntity> positionEntities = DefaultDSLQueryService.createQuery(positionDao)
+                .where().in(PositionEntity.id, positionIds)
+                .list();
+        if (positionEntities.isEmpty()) return;
+        //获取用户是否存在
+        UserEntity oldUser = userService.selectByUsername(bindEntity.getPersonUser().getUsername());
+        if (null != oldUser) {
+            //判断用户是否已经绑定了其他人员
+            int userBindSize = createQuery().where()
+                    .is(PersonEntity.userId, oldUser.getId())
+                    .not(PersonEntity.id, bindEntity.getId())
+                    .total();
+            tryValidateProperty(userBindSize == 0, "personUser.username", "用户已绑定其他人员");
         }
-        return size;
+        // 初始化用户后的操作方式
+        Function<UserEntity, String> userOperationFunction =
+                oldUser == null ? userService::insert : //为空新增,不为空修改
+                        user -> {
+                            userService.update(oldUser.getId(), user);
+                            return oldUser.getId();
+                        };
+        //初始化用户信息
+        //全部角色信息
+        Set<String> roleIds = positionEntities.stream()
+                .map(PositionEntity::getRoles)
+                .filter(Objects::nonNull)
+                .flatMap(List::stream)
+                .collect(Collectors.toSet());
+        BindRoleUserEntity userEntity = entityFactory.newInstance(BindRoleUserEntity.class);
+        userEntity.setUsername(bindEntity.getPersonUser().getUsername());
+        userEntity.setPassword(bindEntity.getPersonUser().getPassword());
+        userEntity.setName(bindEntity.getName());
+        userEntity.setRoles(new ArrayList<>(roleIds));
+        String userId = userOperationFunction.apply(userEntity);
+        bindEntity.setUserId(userId);
     }
 
+
     @Override
     public int deleteByPk(String id) {
         personPositionDao.deleteByPersonId(id);