This commit is contained in:
zhangchenbiao
2023-06-06 17:32:47 +08:00
parent 7a78f59ad7
commit 2d0d896a58
46 changed files with 343 additions and 4400 deletions

View File

@@ -1,62 +0,0 @@
package com.cool.store.dto;
import com.cool.store.entity.EnterpriseConfigDO;
import lombok.Data;
import org.apache.commons.collections4.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
/**
* @author zhangchenbiao
* @FileName: DatasourceInfoDTO
* @Description:
* @date 2023-05-18 14:28
*/
@Data
public class DatasourceInfoDTO {
/**
* serverurl
*/
private String dbServer;
/**
* 端口
*/
private Integer dbPort;
/**
* 数据库用户
*/
private String dbUser;
/**
* 数据库密码
*/
private String dbPwd;
/**
* dbName
*/
private String dbName;
public static List<DatasourceInfoDTO> convertList(List<EnterpriseConfigDO> configList){
if (CollectionUtils.isEmpty(configList)) {
return null;
}
List<DatasourceInfoDTO> resultList = new ArrayList<>();
for (EnterpriseConfigDO enterpriseConfig : configList) {
DatasourceInfoDTO datasource = new DatasourceInfoDTO();
datasource.setDbServer(enterpriseConfig.getDbServer());
datasource.setDbPort(enterpriseConfig.getDbPort());
datasource.setDbUser(enterpriseConfig.getDbUser());
datasource.setDbPwd(enterpriseConfig.getDbPwd());
datasource.setDbName(enterpriseConfig.getDbName());
resultList.add(datasource);
}
return resultList;
}
}

View File

@@ -1,21 +0,0 @@
package com.cool.store.dto.enterprise;
import lombok.Data;
/**
* @author chenyupeng
* @since 2022/1/26
*/
@Data
public class EnterpriseInitDTO {
private String appType;
private String corpId;
private String eid;
private String dbName;
private String userId;
}

View File

@@ -1,42 +0,0 @@
package com.cool.store.dto.enterprise;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 企业开通相关的参数
* @author xugangkun
* @date 2022/2/11 14:14
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class EnterpriseOpenMsg {
/**
* 企业id
*/
private String eid;
/**
* corpId
*/
private String corpId;
/**
* 开通类型
*/
private String appType;
/**
* 授权用户id
*/
private String authUserId;
/**
* 数据库名
*/
private String dbName;
}

View File

@@ -132,8 +132,6 @@ public class EnterpriseUserDTO implements Serializable {
public static EnterpriseUserDO transUserDtoToDo(EnterpriseUserDTO enterpriseUserDTO) {
EnterpriseUserDO enterpriseUserDO = new EnterpriseUserDO();
enterpriseUserDO.setTel(enterpriseUserDTO.getTel());
enterpriseUserDO.setWorkPlace(enterpriseUserDTO.getWorkPlace());
enterpriseUserDO.setRemark(enterpriseUserDTO.getRemark());
enterpriseUserDO.setPosition(enterpriseUserDTO.getPosition());
enterpriseUserDO.setMobile(enterpriseUserDTO.getMobile());
@@ -142,12 +140,8 @@ public class EnterpriseUserDTO implements Serializable {
enterpriseUserDO.setName(enterpriseUserDTO.getName());
enterpriseUserDO.setEmail(enterpriseUserDTO.getEmail());
enterpriseUserDO.setOrgEmail(enterpriseUserDTO.getOrgEmail());
enterpriseUserDO.setActive(Boolean.TRUE);
enterpriseUserDO.setIsBoss(enterpriseUserDTO.getIsBoss());
enterpriseUserDO.setUnionid(enterpriseUserDTO.getUnionid());
enterpriseUserDO.setAvatar(enterpriseUserDTO.getAvatar());
enterpriseUserDO.setIsLeaderInDepts(JSONObject.toJSONString(enterpriseUserDTO.getIsLeaderInDepts()));
enterpriseUserDO.setExtattr(enterpriseUserDTO.getExtattr());
enterpriseUserDO.setCreateTime(new Date());
enterpriseUserDO.setJobnumber(enterpriseUserDTO.getJobnumber());
return enterpriseUserDO;
@@ -162,33 +156,17 @@ public class EnterpriseUserDTO implements Serializable {
enterpriseUserDO.setName(dto.getName());
enterpriseUserDO.setId(dto.getId());
enterpriseUserDO.setUserId(dto.getUserId());
enterpriseUserDO.setTel(dto.getTel());
enterpriseUserDO.setWorkPlace(dto.getWorkPlace());
enterpriseUserDO.setRemark(dto.getRemark());
enterpriseUserDO.setMobile(dto.getMobile());
enterpriseUserDO.setEmail(dto.getEmail());
enterpriseUserDO.setOrgEmail(dto.getOrgEmail());
enterpriseUserDO.setActive(dto.getActive());
enterpriseUserDO.setOrderInDepts(dto.getOrderInDepts());
enterpriseUserDO.setIsAdmin(dto.getIsAdmin());
enterpriseUserDO.setIsBoss(dto.getIsBoss());
enterpriseUserDO.setDingid(dto.getDingid());
enterpriseUserDO.setUnionid(dto.getUnionid());
enterpriseUserDO.setIsHide(dto.getIsHide());
enterpriseUserDO.setPosition(dto.getPosition());
enterpriseUserDO.setAvatar(dto.getAvatar());
enterpriseUserDO.setExtattr(dto.getExtattr());
enterpriseUserDO.setIsEnterprise(dto.getIsEnterprise());
enterpriseUserDO.setRoles(dto.getRoles());
enterpriseUserDO.setIsLeader(dto.getIsLeader());
enterpriseUserDO.setCreateTime(dto.getCreateTime());
enterpriseUserDO.setLanguage(dto.getLanguage());
enterpriseUserDO.setIsLeaderInDepts(JSONObject.toJSONString(dto.getIsLeaderInDepts()));
enterpriseUserDO.setJobnumber(dto.getJobnumber());
enterpriseUserDO.setMonitoredDepartments(dto.getMonitoredDepartments());
/*enterpriseUserDO.setAppType(dto.getAppType());
enterpriseUserDO.setPassword(dto.getPassword());*/
enterpriseUserDO.setThirdOaUniqueFlag(dto.getThirdOaUniqueFlag());
return enterpriseUserDO;
}

View File

@@ -1,91 +0,0 @@
package com.cool.store.entity;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author zhangchenbiao
* @date 2023-05-18 11:09
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class EnterpriseConfigDO implements Serializable {
@ApiModelProperty("自增主键")
private Long id;
@ApiModelProperty("当前套餐")
private Long currentPackage;
@ApiModelProperty("企业id")
private String enterpriseId;
@ApiModelProperty("员工人数")
private Integer staffCount;
@ApiModelProperty("数据库名称")
private String dbSourceName;
@ApiModelProperty("数据库服务器")
private String dbServer;
@ApiModelProperty("端口")
private Integer dbPort;
@ApiModelProperty("数据库名称")
private String dbName;
@ApiModelProperty("数据库用户")
private String dbUser;
@ApiModelProperty("数据库密码")
private String dbPwd;
@ApiModelProperty("授权私钥")
private String license;
@ApiModelProperty("授权到期")
private Date licenseExpires;
@ApiModelProperty("授权类型")
private Integer licenseType;
@ApiModelProperty("钉钉业务id")
private String dingCorpId;
@ApiModelProperty("钉钉秘钥")
private String dingCorpSecret;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("创建人")
private String createUser;
@ApiModelProperty("主应用Id")
private String mainCorpId;
@ApiModelProperty("来源类型默认dingding钉钉,qw企业微信 mobile")
private String appType;
@ApiModelProperty("授权码")
private String permanentCode;
@ApiModelProperty("应用id")
private String agentid;
@ApiModelProperty("开通酷学院企业映射的企业id")
private String coolCollegeEnterpriseId;
@ApiModelProperty("开通酷学院企业返回的企业秘钥")
private String coolCollegeSecret;
}

View File

@@ -1,102 +0,0 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
*
* @author zhangchenbiao
* @date 2023-05-23 11:36
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class EnterpriseDO implements Serializable {
@ApiModelProperty("企业主键")
private String id;
@ApiModelProperty("企业名称")
private String name;
@ApiModelProperty("原始名称")
private String originalName;
@ApiModelProperty("电话")
private String mobile;
@ApiModelProperty("")
private String province;
@ApiModelProperty("")
private String city;
@ApiModelProperty("状态")
private Integer status;
@ApiModelProperty("")
private String logo;
@ApiModelProperty("用户类型(1:普通用户 2:付费用户 3:试用用户 4:共创用户)")
private Integer isVip;
@ApiModelProperty("授权人数")
private Integer authType;
@ApiModelProperty("")
private String authUserId;
@ApiModelProperty("")
private String industry;
@ApiModelProperty("logo名称")
private String logoName;
@ApiModelProperty("企业logo")
private String corpLogoUrl;
@ApiModelProperty("企业是否认证")
private Integer isAuthenticated;
@ApiModelProperty("企业认证等级0未认证1高级认证2中级认证3初级认证")
private Integer authLevel;
@ApiModelProperty("注册时间")
private Date createTime;
@ApiModelProperty("修改时间")
private Date updateTime;
@ApiModelProperty("套餐开始时间")
private Date packageBeginDate;
@ApiModelProperty("套餐结束时间")
private Date packageEndDate;
@ApiModelProperty("人员分组的cropId")
private String aliyunPersonGroupCropId;
@ApiModelProperty("来源类型默认dingding钉钉,qw企业微信 mobile")
private String appType;
@ApiModelProperty("企业标签")
private String tag;
@ApiModelProperty("数仓设置")
private String datawareConfig;
@ApiModelProperty("是否留资")
private Boolean isLeaveInfo;
@ApiModelProperty("限制的门店数量")
private Integer limitStoreCount;
@ApiModelProperty("设备数量")
private Integer limitDeviceCount;
}

View File

@@ -1,132 +0,0 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author zhangchenbiao
* @date 2023-05-19 02:58
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class EnterpriseUserDO implements Serializable {
@ApiModelProperty("用户主键id")
private String id;
@ApiModelProperty("钉钉用户id")
private String userId;
@ApiModelProperty("")
private String name;
@ApiModelProperty("分机号")
private String tel;
@ApiModelProperty("")
private String workPlace;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("手机号码")
private String mobile;
@ApiModelProperty("员工的电子邮箱")
private String email;
@ApiModelProperty("员工的企业邮箱")
private String orgEmail;
@ApiModelProperty("是否已经激活, true表示已激活, false表示未激活")
private Boolean active;
@ApiModelProperty("")
private String orderInDepts;
@ApiModelProperty("是否是主管理员01")
private Boolean mainAdmin;
@ApiModelProperty("是否为企业的管理员, true表示是, false表示不是")
private Boolean isAdmin;
@ApiModelProperty("是否为企业的老板, true表示是, false表示不是")
private Boolean isBoss;
@ApiModelProperty("钉钉Id,在钉钉全局范围内标识用户的身份,但用户可以自行修改一次")
private String dingid;
@ApiModelProperty("在当前isv全局范围内唯一标识一个用户的身份,用户无法修改")
private String unionid;
@ApiModelProperty("是否号码隐藏, true表示隐藏, false表示不隐藏")
private Boolean isHide;
@ApiModelProperty("")
private String position;
@ApiModelProperty("头像url")
private String avatar;
@ApiModelProperty("扩展属性,可以设置多种属性(但手机上最多只能显示10个扩展属性具体显示哪些属性请到OA管理后台->设置->通讯录信息设置和OA管理后台->设置->手机端显示信息设置)性")
private String extattr;
@ApiModelProperty("")
private Boolean isEnterprise;
@ApiModelProperty("")
private String roles;
@ApiModelProperty("是否是部门的主管, true表示是, false表示不是")
private Boolean isLeader;
@ApiModelProperty("人脸照片url")
private String faceUrl;
@ApiModelProperty("用户创建时间")
private Date createTime;
@ApiModelProperty("用户语言环境:en_us/英语_美国,zh_cn/中文_简体,zh_hk/中文_繁体_HK")
private String language;
@ApiModelProperty("用户状态 0待审核 1正常 2冻结")
private Integer userStatus;
@ApiModelProperty("第三方OA系统唯一标识")
private String thirdOaUniqueFlag;
@ApiModelProperty("下级是否变动0 没变动1 变动")
private Integer subordinateChange;
@ApiModelProperty("修改时间")
private Date updateTime;
@ApiModelProperty("管辖用户范围self-仅自己all-全部人员define-自定义")
private String subordinateRange;
@ApiModelProperty("")
private String isLeaderInDepts;
@ApiModelProperty("")
private String department;
@ApiModelProperty("工号")
private String jobnumber;
@ApiModelProperty("")
private String monitoredDepartments;
@ApiModelProperty("部门全路径")
private String departments;
@ApiModelProperty("部门集合region_ids")
private String userRegionIds;
}

View File

@@ -1,43 +0,0 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author zhangchenbiao
* @date 2023-06-02 05:01
*/
@Data
public class EnterpriseUserDepartmentDO implements Serializable {
@ApiModelProperty("")
private Integer id;
@ApiModelProperty("用户id")
private String userId;
@ApiModelProperty("部门id")
private String departmentId;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("是否是部门权限数据0否1是")
private Boolean isHasAuth;
public EnterpriseUserDepartmentDO(String userId, String departmentId, Boolean isHasAuth) {
this.userId = userId;
this.departmentId = departmentId;
this.isHasAuth = isHasAuth;
}
public EnterpriseUserDepartmentDO() {}
}

View File

@@ -1,47 +0,0 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author zhangchenbiao
* @date 2023-05-31 02:43
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class EnterpriseUserGroupDO implements Serializable {
@ApiModelProperty("主键")
private Long id;
@ApiModelProperty("组别id")
private String groupId;
@ApiModelProperty("组别名称")
private String groupName;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("创建人id")
private String createUserId;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("更新人")
private String updateUserId;
@ApiModelProperty("删除标识")
private Boolean deleted;
@ApiModelProperty("共同编辑人userId集合前后逗号分隔")
private String commonEditUserids;
}

View File

@@ -1,44 +0,0 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author zhangchenbiao
* @date 2023-05-31 02:43
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class EnterpriseUserGroupMappingDO implements Serializable {
@ApiModelProperty("主键")
private Long id;
@ApiModelProperty("用户id")
private String userId;
@ApiModelProperty("组别id")
private String groupId;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("创建人id")
private String createUserId;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("更新人")
private String updateUserId;
@ApiModelProperty("删除标识")
private Boolean deleted;
}

View File

@@ -1,133 +0,0 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author zhangchenbiao
* @date 2023-05-31 11:51
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class StoreDO implements Serializable {
@ApiModelProperty("自增ID")
private Long id;
@ApiModelProperty("门店ID")
private String storeId;
@ApiModelProperty("门店名称")
private String storeName;
@ApiModelProperty("门店编号")
private String storeNum;
@ApiModelProperty("门头照")
private String avatar;
@ApiModelProperty("钉钉id")
private String dingId;
@ApiModelProperty("所属区域id")
private Long regionId;
@ApiModelProperty("")
private String province;
@ApiModelProperty("")
private String city;
@ApiModelProperty("")
private String county;
@ApiModelProperty("门店地址")
private String storeAddress;
@ApiModelProperty("定位地址")
private String locationAddress;
@ApiModelProperty("锁定定位:locked/锁定,not_locked/未锁定")
private String isLock;
@ApiModelProperty("经纬度")
private String longitudeLatitude;
@ApiModelProperty("经度")
private String longitude;
@ApiModelProperty("纬度")
private String latitude;
@ApiModelProperty("状态:effective/有效,invalid/失效,ignored/不可用, unSync/未同步")
private String isDelete;
@ApiModelProperty("电话号码")
private String telephone;
@ApiModelProperty("营业时间")
private String businessHours;
@ApiModelProperty("门店面积")
private String storeAcreage;
@ApiModelProperty("门店带宽")
private String storeBandwidth;
@ApiModelProperty("创建时间")
private Long createTime;
@ApiModelProperty("创建人")
private String createName;
@ApiModelProperty("创建人id")
private String createUser;
@ApiModelProperty("更新时间")
private Long updateTime;
@ApiModelProperty("更新人")
private String updateName;
@ApiModelProperty("修改人id")
private String updateUser;
@ApiModelProperty("阿里云corpId")
private String aliyunCorpId;
@ApiModelProperty("门店来源")
private String source;
@ApiModelProperty("vds的corpId")
private String vdsCorpId;
@ApiModelProperty("dinging部门id")
private String synDingDeptId;
@ApiModelProperty("区域路径")
private String regionPath;
@ApiModelProperty("是否绑定绑定摄像头0:未绑定;1:已绑定")
private Boolean hasCamera;
@ApiModelProperty("门店状态open营业closed闭店not_open未开业")
private String storeStatus;
@ApiModelProperty("第三方唯一id")
private String thirdDeptId;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("动态扩展字段")
private String extendField;
@ApiModelProperty("地址经纬度point")
private String addressPoint;
}

View File

@@ -1,52 +0,0 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author zhangchenbiao
* @date 2023-05-31 02:27
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SubordinateMappingDO implements Serializable {
@ApiModelProperty("主键")
private Integer id;
@ApiModelProperty("用户ID")
private String userId;
@ApiModelProperty("部门ID")
private String regionId;
@ApiModelProperty("人员ID")
private String personalId;
@ApiModelProperty("0 下属 1 直属上级")
private Integer type;
@ApiModelProperty("创建人")
private String createId;
@ApiModelProperty("创建时间")
private Long createTime;
@ApiModelProperty("更新人")
private String updateId;
@ApiModelProperty("更新时间")
private Long updateTime;
@ApiModelProperty("管辖用户范围self-仅自己all-全部人员define-自定义")
private String userRange;
@ApiModelProperty("auto自动关联 select手动选择")
private String source;
}

View File

@@ -1,52 +0,0 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import lombok.Data;
/**
*
* @author zhangchenbiao
* @date 2023-05-19 02:54
*/
@Data
public class UserAuthMappingDO implements Serializable {
@ApiModelProperty("主键")
private Long id;
@ApiModelProperty("用户ID")
private String userId;
@ApiModelProperty("映射主键(区域或者是门店)")
private String mappingId;
@ApiModelProperty("映射类型 region (区域) store(门店)")
private String type;
@ApiModelProperty("来源create-数智门店创建 sync-钉钉同步")
private String source;
@ApiModelProperty("创建人")
private String createId;
@ApiModelProperty("创建时间")
private Long createTime;
@ApiModelProperty("更新人")
private String updateId;
@ApiModelProperty("更新时间")
private Long updateTime;
public UserAuthMappingDO(String userId, String mappingId, String type, String source, String createId, Long createTime) {
this.userId = userId;
this.mappingId = mappingId;
this.type = type;
this.source = source;
this.createId = createId;
this.createTime = createTime;
}
public UserAuthMappingDO(){}
}

View File

@@ -1,7 +1,6 @@
package com.cool.store.vo.buser;
import com.cool.store.dto.auth.AuthRegionStoreUserDTO;
import com.cool.store.entity.EnterpriseUserDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -88,7 +87,7 @@ public class EnterpriseUserPageVO implements Serializable {
private Boolean selectFlag;
public static List<EnterpriseUserPageVO> transUserDOToVO(List<EnterpriseUserDO> enterpriseUserList) {
/*public static List<EnterpriseUserPageVO> transUserDOToVO(List<EnterpriseUserDO> enterpriseUserList) {
List<EnterpriseUserPageVO> resultList = new ArrayList<>();
for (EnterpriseUserDO enterpriseUserDTO : enterpriseUserList) {
EnterpriseUserPageVO enterpriseUserDO = new EnterpriseUserPageVO();
@@ -107,6 +106,6 @@ public class EnterpriseUserPageVO implements Serializable {
resultList.add(enterpriseUserDO);
}
return resultList;
}
}*/
}