Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 88f748b6 by 李小龙
Options

整理代码

parent 6f435dc1
Inline Side-by-side
Showing with 169 additions and 12 deletions
db/saas.sql
...@@ -61,7 +61,7 @@ CREATE TABLE `saas_role_menu` ( ...@@ -61,7 +61,7 @@ CREATE TABLE `saas_role_menu` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='saas端角色菜单关联表'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='saas端角色菜单关联表';
CREATE TABLE `saas_menu` ( CREATE TABLE `saas_menu` (
`id` varchar(64) NOT NULL COLLATE utf8mb4_general_ci COMMENT 'id', `id` varchar(64) NOT NULL COMMENT 'id',
`parent_id` varchar(64) NOT NULL COMMENT '父级id', `parent_id` varchar(64) NOT NULL COMMENT '父级id',
`name` varchar(100) NOT NULL COMMENT '名称', `name` varchar(100) NOT NULL COMMENT '名称',
`code` varchar(100) DEFAULT NULL COMMENT '模块+类名+方法', `code` varchar(100) DEFAULT NULL COMMENT '模块+类名+方法',
...@@ -76,16 +76,18 @@ CREATE TABLE `saas_menu` ( ...@@ -76,16 +76,18 @@ CREATE TABLE `saas_menu` (
`hidden_status` char(1) DEFAULT NULL COMMENT '隐藏状态 0不隐藏 1隐藏', `hidden_status` char(1) DEFAULT NULL COMMENT '隐藏状态 0不隐藏 1隐藏',
`create_date` datetime NOT NULL COMMENT '创建时间', `create_date` datetime NOT NULL COMMENT '创建时间',
`update_date` datetime NOT NULL COMMENT '更新时间', `update_date` datetime NOT NULL COMMENT '更新时间',
`del_flag` CHAR(1) DEFAULT NULL COMMENT '删除标识', `del_flag` char(1) DEFAULT NULL COMMENT '删除标识',
`cache_status` char(1) DEFAULT NULL COMMENT '缓存状态 0不缓存 1缓存', `cache_status` char(1) DEFAULT NULL COMMENT '缓存状态 0不缓存 1缓存',
`create_by` varchar(64) NOT NULL COMMENT '创建人', `create_by` varchar(64) NOT NULL COMMENT '创建人',
`update_by` varchar(64) NOT NULL COMMENT '更新人', `update_by` varchar(64) NOT NULL COMMENT '更新人',
`page_type` varchar(4) DEFAULT NULL COMMENT '页面类别',
`page_query` varchar(512) DEFAULT NULL COMMENT '跳转参数',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='saas端菜单'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='saas端菜单';
CREATE TABLE `plat_menu` ( CREATE TABLE `plat_menu` (
`id` varchar(64) NOT NULL COLLATE utf8mb4_general_ci COMMENT '主键id', `id` varchar(64) NOT NULL COMMENT '主键id',
`parent_id` varchar(64) NOT NULL COMMENT '父级id', `parent_id` varchar(64) NOT NULL COMMENT '父级id',
`name` varchar(100) NOT NULL COMMENT '资源名称', `name` varchar(100) NOT NULL COMMENT '资源名称',
`request_path` varchar(200) DEFAULT NULL COMMENT '账号链接', `request_path` varchar(200) DEFAULT NULL COMMENT '账号链接',
...@@ -98,10 +100,11 @@ CREATE TABLE `plat_menu` ( ...@@ -98,10 +100,11 @@ CREATE TABLE `plat_menu` (
`status` char(1) NOT NULL COMMENT '状态 0禁用 1启用', `status` char(1) NOT NULL COMMENT '状态 0禁用 1启用',
`create_date` datetime NOT NULL COMMENT '创建时间', `create_date` datetime NOT NULL COMMENT '创建时间',
`update_date` datetime NOT NULL COMMENT '更新时间', `update_date` datetime NOT NULL COMMENT '更新时间',
`del_flag` CHAR(1) DEFAULT NULL COMMENT '删除标识', `del_flag` char(1) DEFAULT NULL COMMENT '删除标识',
`create_by` varchar(64) NOT NULL COMMENT '创建人', `create_by` varchar(64) NOT NULL COMMENT '创建人',
`update_by` varchar(64) NOT NULL COMMENT '更新人', `update_by` varchar(64) NOT NULL COMMENT '更新人',
`page_type` varchar(4) DEFAULT NULL COMMENT '页面类别',
`page_query` varchar(512) DEFAULT NULL COMMENT '跳转参数',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='租户端资源管理'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='租户端资源管理';
......
server-common/src/main/java/com/makeit/enums/RegConst.java
...@@ -7,7 +7,7 @@ public class RegConst { ...@@ -7,7 +7,7 @@ public class RegConst {
//public static final String PW_PATTERN = "^(?![A-Za-z0-9]+$)(?![a-z0-9\\W]+$)(?![A-Za-z\\W]+$)(?![A-Z0-9\\W]+$)[a-zA-Z0-9\\W]{6,18}$"; //public static final String PW_PATTERN = "^(?![A-Za-z0-9]+$)(?![a-z0-9\\W]+$)(?![A-Za-z\\W]+$)(?![A-Z0-9\\W]+$)[a-zA-Z0-9\\W]{6,18}$";
public static final String PW_PATTERN = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z\\W]{6,18}$"; public static final String PW_PATTERN = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z\\W]{6,20}$";
public static final String LINE_CODE = "\\w{0,64}"; public static final String LINE_CODE = "\\w{0,64}";
......
server-common/src/main/java/com/makeit/module/admin/dto/plat/PlatMenuDTOVO.java
...@@ -68,4 +68,14 @@ public class PlatMenuDTOVO extends BaseIdDTO { ...@@ -68,4 +68,14 @@ public class PlatMenuDTOVO extends BaseIdDTO {
@ApiModelProperty(value = "缓存状态 0不缓存 1缓存") @ApiModelProperty(value = "缓存状态 0不缓存 1缓存")
private String cacheStatus; private String cacheStatus;
/**
* 页面类别
*/
private String pageType;
/**
* 跳转参数
*/
private String pageQuery;
} }
server-common/src/main/java/com/makeit/module/admin/dto/saas/SaasMenuDTOVO.java
...@@ -72,4 +72,8 @@ public class SaasMenuDTOVO extends BaseIdDTO implements Serializable { ...@@ -72,4 +72,8 @@ public class SaasMenuDTOVO extends BaseIdDTO implements Serializable {
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "子集") @ApiModelProperty(value = "子集")
private List<SaasMenuDTOVO> children; private List<SaasMenuDTOVO> children;
private String pageType;
private String pageQuery;
} }
server-common/src/main/java/com/makeit/module/admin/vo/plat/PlatUserLoginVO.java
...@@ -4,9 +4,12 @@ import com.makeit.module.admin.dto.plat.PlatMenuDTOVO; ...@@ -4,9 +4,12 @@ import com.makeit.module.admin.dto.plat.PlatMenuDTOVO;
import com.makeit.module.admin.dto.plat.PlatRoleDTOVO; import com.makeit.module.admin.dto.plat.PlatRoleDTOVO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.function.BiConsumer;
@Data @Data
public class PlatUserLoginVO implements Serializable { public class PlatUserLoginVO implements Serializable {
...@@ -32,6 +35,18 @@ public class PlatUserLoginVO implements Serializable { ...@@ -32,6 +35,18 @@ public class PlatUserLoginVO implements Serializable {
@ApiModelProperty(value = "部门树id") @ApiModelProperty(value = "部门树id")
private String orgId; private String orgId;
@ApiModelProperty(value = "城市组织id")
private String cityOrgId;
@ApiModelProperty(value = "区组织id")
private String districtOrgId;
@ApiModelProperty(value = "街道组织id")
private String streetOrgId;
@ApiModelProperty(value = "组织路径")
private String orgPath;
@ApiModelProperty("token") @ApiModelProperty("token")
private String token; private String token;
...@@ -55,4 +70,41 @@ public class PlatUserLoginVO implements Serializable { ...@@ -55,4 +70,41 @@ public class PlatUserLoginVO implements Serializable {
private String userType = "plat"; private String userType = "plat";
private boolean initFlag = false;
public void init(){
if(initFlag){
return;
}
if(StringUtils.isBlank(orgPath)){
return;
}
List<BiConsumer<PlatUserLoginVO,String>> list = Arrays.asList(
PlatUserLoginVO::setCityOrgId,
PlatUserLoginVO::setDistrictOrgId,
PlatUserLoginVO::setStreetOrgId
);
String[] split = orgPath.split(",");
for (int i = 1; i < split.length; i++) {
BiConsumer<PlatUserLoginVO, String> e = list.get(i-1);
e.accept(this,split[i]);
}
this.initFlag = true;
}
public String getCityOrgId() {
init();
return cityOrgId;
}
public String getDistrictOrgId() {
init();
return districtOrgId;
}
public String getStreetOrgId() {
init();
return streetOrgId;
}
} }
server-common/src/main/java/com/makeit/utils/user/PasswordUtils.java
package com.makeit.utils.user; package com.makeit.utils.user;
import com.makeit.enums.CodeMessageEnum; import com.makeit.enums.CodeMessageEnum;
import com.makeit.enums.RegConst;
import com.makeit.exception.BusinessException; import com.makeit.exception.BusinessException;
import com.makeit.utils.old.StringUtils; import com.makeit.utils.old.StringUtils;
import com.makeit.utils.old.encode.Digests; import com.makeit.utils.old.encode.Digests;
...@@ -21,14 +22,14 @@ public class PasswordUtils { ...@@ -21,14 +22,14 @@ public class PasswordUtils {
public static void validatePasswordFormat(String plainPassword) { public static void validatePasswordFormat(String plainPassword) {
// if (StringUtils.isBlank(plainPassword) || !plainPassword.matches(PW_PATTERN) || plainPassword.contains(" ")) { if (StringUtils.isBlank(plainPassword) || !plainPassword.matches(RegConst.PW_PATTERN) || plainPassword.contains(" ")) {
// throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_PASSWORD_FORMAT_ERROR);
// }
if (StringUtils.isBlank(plainPassword) ) {
throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_PASSWORD_FORMAT_ERROR); throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_PASSWORD_FORMAT_ERROR);
} }
// if (StringUtils.isBlank(plainPassword) ) {
// throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_PASSWORD_FORMAT_ERROR);
// }
} }
......
server-common/src/main/java/com/makeit/utils/user/plat/PlatUserVO.java
package com.makeit.utils.user.plat; package com.makeit.utils.user.plat;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
import java.util.function.BiConsumer;
@Data @Data
public class PlatUserVO implements Serializable { public class PlatUserVO implements Serializable {
...@@ -16,6 +20,20 @@ public class PlatUserVO implements Serializable { ...@@ -16,6 +20,20 @@ public class PlatUserVO implements Serializable {
private String orgId; private String orgId;
//城市组织id
private String cityOrgId;
//区组织id
private String districtOrgId;
//街道组织id
private String streetOrgId;
//组织全路径 逗号拼接
private String orgPath;
public PlatUserVO() { public PlatUserVO() {
} }
...@@ -29,4 +47,46 @@ public class PlatUserVO implements Serializable { ...@@ -29,4 +47,46 @@ public class PlatUserVO implements Serializable {
this.id = id; this.id = id;
this.name = name; this.name = name;
} }
private boolean initFlag = false;
public void init(){
if(initFlag){
return;
}
if(StringUtils.isBlank(orgPath)){
return;
}
List<BiConsumer<PlatUserVO,String>> list = Arrays.asList(
PlatUserVO::setCityOrgId,
PlatUserVO::setDistrictOrgId,
PlatUserVO::setStreetOrgId
);
String[] split = orgPath.split(",");
for (int i = 1; i < split.length; i++) {
BiConsumer<PlatUserVO, String> e = list.get(i-1);
e.accept(this,split[i]);
}
this.initFlag = true;
}
public String getCityOrgId() {
init();
return cityOrgId;
}
public String getDistrictOrgId() {
init();
return districtOrgId;
}
public String getStreetOrgId() {
init();
return streetOrgId;
}
} }
server-common/src/main/resources/locale/business_messages.properties
...@@ -32,7 +32,7 @@ SYSTEM.ERROR.CODE.RATE.LIMIT=验证码发送过于频繁，请稍后在发送 ...@@ -32,7 +32,7 @@ SYSTEM.ERROR.CODE.RATE.LIMIT=验证码发送过于频繁，请稍后在发送
SYSTEM.ERROR.USER.PASSWORD.NOT.BLANK=密码不能为空 SYSTEM.ERROR.USER.PASSWORD.NOT.BLANK=密码不能为空
#SYSTEM.ERROR.USER.PASSWORD.FORMAT.ERROR=密码必须是包含大写字母、小写字母、数字、特殊符号(不含空格)的6~18位组合 #SYSTEM.ERROR.USER.PASSWORD.FORMAT.ERROR=密码必须是包含大写字母、小写字母、数字、特殊符号(不含空格)的6~18位组合
SYSTEM.ERROR.USER.PASSWORD.FORMAT.ERROR=含字母和数字的6-18位密码 SYSTEM.ERROR.USER.PASSWORD.FORMAT.ERROR=含字母和数字的6-20位密码
SYSTEM.ERROR.USER.PASSWORD.SAME=支付密码不能与登录密码一致 SYSTEM.ERROR.USER.PASSWORD.SAME=支付密码不能与登录密码一致
SYSTEM.ERROR.USER.SUPER.ADMIN.CANT.DO=超级管理员或超级管理员角色不支持该操作 SYSTEM.ERROR.USER.SUPER.ADMIN.CANT.DO=超级管理员或超级管理员角色不支持该操作
......
server-service/src/main/java/com/makeit/entity/saas/PlatMenu.java
...@@ -62,4 +62,14 @@ public class PlatMenu extends BaseEntity { ...@@ -62,4 +62,14 @@ public class PlatMenu extends BaseEntity {
*/ */
private String status; private String status;
/**
* 页面类别
*/
private String pageType;
/**
* 跳转参数
*/
private String pageQuery;
} }
\ No newline at end of file
server-service/src/main/java/com/makeit/entity/saas/SaasMenu.java
...@@ -77,4 +77,14 @@ public class SaasMenu extends BaseEntity { ...@@ -77,4 +77,14 @@ public class SaasMenu extends BaseEntity {
*/ */
private String cacheStatus; private String cacheStatus;
/**
* 页面类别
*/
private String pageType;
/**
* 跳转参数
*/
private String pageQuery;
} }
\ No newline at end of file
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java
...@@ -784,6 +784,9 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser> ...@@ -784,6 +784,9 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
user.setStatus(CommonEnum.YES.getValue()); user.setStatus(CommonEnum.YES.getValue());
user.setAccount(dto.getMobile()); user.setAccount(dto.getMobile());
PlatOrg platOrg = platOrgService.getById(dto.getId());
user.setOrgPath(platOrg.getPath()+","+platOrg.getId());
save(user); save(user);
dto.setId(user.getId()); dto.setId(user.getId());
setRoleList(dto); setRoleList(dto);
...@@ -802,6 +805,8 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser> ...@@ -802,6 +805,8 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
setPassword(user); setPassword(user);
PlatOrg platOrg = platOrgService.getById(dto.getId());
user.setOrgPath(platOrg.getPath()+","+platOrg.getId());
updateById(user); updateById(user);
setRoleList(dto); setRoleList(dto);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment