大调整

coolstore-partner-model/src/main/java/com/cool/store/entity/SysRoleDO.java

@@ -1,5 +1,8 @@
 package com.cool.store.entity;
 
+import cn.hutool.crypto.digest.MD5;
+import com.cool.store.constants.CommonConstants;
+import com.cool.store.enums.DataSourceEnum;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
@@ -11,40 +14,30 @@ import lombok.NoArgsConstructor;
 /**
  * 
  * @author   zhangchenbiao
- * @date   2023-05-19 03:00
+ * @date   2023-06-08 10:54
  */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class SysRoleDO implements Serializable {
-
     @ApiModelProperty("自增id")
     private Long id;
 
-    @ApiModelProperty("")
+    @ApiModelProperty("角色id")
+    private String roleId;
+
+    @ApiModelProperty("角色名称")
     private String roleName;
 
-    @ApiModelProperty("是否预制")
-    private Boolean isInternal;
+    @ApiModelProperty("角色类型 0-同步 1-自建")
+    private Integer roleType;
 
-    @ApiModelProperty("角色权限范围all（全企业数据）include_subordinate(所在组织架构包含下级) not_include_subordinate(所在的组织架构不包含下级) personal （仅自己的数据） ")
-    private String roleAuth;
+    @ApiModelProperty("第三方唯一id")
+    private String thirdUniqueId;
 
-    @ApiModelProperty("岗位来源:(create:自建岗位, sync:从钉钉同步的角色，sync_position从钉钉同步的职位, ehr 从第三方ehr同步的)")
-    private String source;
-
-    @ApiModelProperty("职位类型：store_outside-店外，store_inside-店内")
-    private String positionType;
-
-    @ApiModelProperty("移动端菜单")
-    private String appMenu;
-
-    @ApiModelProperty("钉钉角色id")
-    private Long synDingRoleId;
-
-    @ApiModelProperty("角色排序 1.管理员 1-99.门店职位 100+.钉钉角色")
-    private Integer priority;
+    @ApiModelProperty("删除标识")
+    private Boolean deleted;
 
     @ApiModelProperty("创建时间")
     private Date createTime;
@@ -52,15 +45,20 @@ public class SysRoleDO implements Serializable {
     @ApiModelProperty("更新时间")
     private Date updateTime;
 
-    @ApiModelProperty("角色枚举用于判定逻辑")
-    private String roleEnum;
-
     @ApiModelProperty("创建人")
     private String createUser;
 
     @ApiModelProperty("更新人")
     private String updateUser;
 
-    @ApiModelProperty("第三方唯一id")
-    private String thirdUniqueId;
+    public static SysRoleDO convertSyncDO(String roleName){
+        SysRoleDO role = new SysRoleDO();
+        role.setRoleId(MD5.create().digestHex(roleName));
+        role.setRoleName(roleName);
+        role.setRoleType(DataSourceEnum.SYNC.getCode());
+        role.setDeleted(Boolean.FALSE);
+        role.setCreateTime(new Date());
+        role.setUpdateTime(new Date());
+        return role;
+    }
 }

coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java

@@ -1,23 +1,30 @@
 package com.cool.store.entity;
 
+import com.cool.store.constants.CommonConstants;
+import com.cool.store.dto.enterprise.EnterpriseUserDTO;
+import com.cool.store.enums.DataSourceEnum;
+import com.google.common.collect.Lists;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
 
 /**
  * 
  * @author   zhangchenbiao
- * @date   2023-05-19 03:00
+ * @date   2023-06-07 02:07
  */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class UserRegionMappingDO implements Serializable {
-
     @ApiModelProperty("主键")
     private Integer id;
 
@@ -27,6 +34,12 @@ public class UserRegionMappingDO implements Serializable {
     @ApiModelProperty("用户ID")
     private String userId;
 
+    @ApiModelProperty("类型")
+    private Integer type;
+
+    @ApiModelProperty("删除标识")
+    private Boolean deleted;
+
     @ApiModelProperty("创建人")
     private String createId;
 
@@ -38,4 +51,22 @@ public class UserRegionMappingDO implements Serializable {
 
     @ApiModelProperty("更新时间")
     private Long updateTime;
+
+    public static List<UserRegionMappingDO> convertSyncDO(String regionId, List<EnterpriseUserDTO> departmentUsers){
+        if(CollectionUtils.isEmpty(departmentUsers)){
+            return Lists.newArrayList();
+        }
+        List<UserRegionMappingDO> resultList = new ArrayList<>();
+        for (EnterpriseUserDTO departmentUser : departmentUsers) {
+            UserRegionMappingDO userRegion = new UserRegionMappingDO();
+            userRegion.setRegionId(regionId);
+            userRegion.setUserId(departmentUser.getUserId());
+            userRegion.setType(DataSourceEnum.SYNC.getCode());
+            userRegion.setCreateTime(System.currentTimeMillis());
+            userRegion.setUpdateTime(System.currentTimeMillis());
+            userRegion.setDeleted(Boolean.FALSE);
+            resultList.add(userRegion);
+        }
+        return resultList;
+    }
 }