Skip to content

S
smart_gov_platform
Commit 6cb61c56 authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改用户登录，数据库表等

parent 34cd5ee0
Hide whitespace changes
Inline Side-by-side
Showing with 4139 additions and 4285 deletions
common-lib/src/main/java/com/mortals/xhx/feign/area/IApiAreaFeign.java
View file @ 6cb61c56
...@@ -5,7 +5,10 @@ import com.mortals.xhx.feign.req.BaseUserQuery; ...@@ -5,7 +5,10 @@ import com.mortals.xhx.feign.req.BaseUserQuery;
import com.mortals.xhx.feign.req.BaseUserReq; import com.mortals.xhx.feign.req.BaseUserReq;
import com.mortals.xhx.feign.rsp.ApiResp; import com.mortals.xhx.feign.rsp.ApiResp;
import com.mortals.xhx.feign.rsp.UserRsp; import com.mortals.xhx.feign.rsp.UserRsp;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
/** /**
...@@ -14,7 +17,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -14,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
* @author: zxfei * @author: zxfei
* @date: 2022/5/30 10:40 * @date: 2022/5/30 10:40
*/ */
@FeignClient(name = "base-manager", path = "/zwfw") @FeignClient(name = "base-manager", path = "/zwfw", fallback = AreaFeignFallbackFactory.class)
public interface IApiAreaFeign extends IFeign { public interface IApiAreaFeign extends IFeign {
/** /**
...@@ -25,7 +28,24 @@ public interface IApiAreaFeign extends IFeign { ...@@ -25,7 +28,24 @@ public interface IApiAreaFeign extends IFeign {
*/ */
@GetMapping(value = "/area/getListByParentId") @GetMapping(value = "/area/getListByParentId")
String getListByParentId(@RequestParam(value = "parentId") String parentId, String getListByParentId(@RequestParam(value = "parentId") String parentId,
@RequestHeader(name = "Authorization",required = true) String token); @RequestHeader(name = "Authorization", required = true) String token);
} }
@Slf4j
@Component
class AreaFeignFallbackFactory implements FallbackFactory<IApiAreaFeign> {
@Override
public IApiAreaFeign create(Throwable t) {
return new IApiAreaFeign() {
@Override
public String getListByParentId(String parentId, String token) {
log.error("暂时无法获取区域信息，请稍后再试!parentId:{},token:{}", parentId, token);
log.error(t.getMessage());
return null;
}
};
}
}
portal-manager/db/db.sql
View file @ 6cb61c56
-- ---------------------------- -- ----------------------------
-- Table structure for mortals_xhx_idgenerator -- 用户信息业务表
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_idgenerator`;
CREATE TABLE `mortals_xhx_idgenerator` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '序号，主键，自增长',
`idType` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'id类型',
`idMaxValue` bigint(20) UNSIGNED NOT NULL COMMENT 'id值',
`remark` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '备注',
`versionNum` bigint(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT '版本号，默认0',
`gmtModify` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '最后修改时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '主键Id生成器' ROW_FORMAT = Dynamic;
-- ----------------------------
-- 操作日志业务表
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_oper_log`; DROP TABLE IF EXISTS `mortals_xhx_user`;
CREATE TABLE mortals_xhx_oper_log( CREATE TABLE mortals_xhx_user(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长', `id` bigint(20) AUTO_INCREMENT COMMENT '用户ID，主键，自增长',
`platformMark` varchar(50) COMMENT '平台标识', `loginName` varchar(50) COMMENT '登录名',
`userId` bigint(20) COMMENT '用户id', `loginPwd` varchar(128) COMMENT '登录密码，使用md5双次加密',
`userName` varchar(50) COMMENT '用户名称', `loginLimitAddress` varchar(200) COMMENT '登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录',
`loginName` varchar(50) COMMENT '用户登录名', `realName` varchar(50) COMMENT '用户名',
`requestUrl` varchar(200) COMMENT '请求地址', `mobile` varchar(21) COMMENT '用户手机号',
`content` varchar(2000) COMMENT '操作内容，记录操作具体信息，如修改前修改或的数据', `phone` varchar(21) COMMENT '用户联系电话',
`ip` varchar(30) COMMENT '操作IP地址', `email` varchar(50) COMMENT '用户邮箱',
`logDate` datetime COMMENT '操作时间', `qq` varchar(20) COMMENT 'QQ号码',
`operType` tinyint(2) COMMENT '操作类型，0：新增，1：修改，2：删除', `userType` tinyint(2) COMMENT '用户类型(0.系统用户,1.普通用户,2.工作人员)',
`siteIds` varchar(512) COMMENT '所属站点id,多个逗号分隔',
`areaCodes` varchar(512) COMMENT '所属区域code,多个逗号分隔',
`modeIds` varchar(512) COMMENT '拥有系统模块,多个逗号分隔',
`status` tinyint(2) COMMENT '用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)',
`customerId` bigint(20) COMMENT '客户ID',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`createUserName` varchar(50) COMMENT '创建用户名称',
`lastLoginTime` datetime COMMENT '最后一次登录时间',
`lastLoginAddress` varchar(21) COMMENT '最后一次登录地址',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='操作日志业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户信息业务';
-- ---------------------------- -- ----------------------------
-- 参数信息业务表 -- 参数信息业务表
-- ---------------------------- -- ----------------------------
...@@ -41,15 +37,16 @@ CREATE TABLE mortals_xhx_param( ...@@ -41,15 +37,16 @@ CREATE TABLE mortals_xhx_param(
`secondOrganize` varchar(100) COMMENT '二级组织，如：基础配置', `secondOrganize` varchar(100) COMMENT '二级组织，如：基础配置',
`paramKey` varchar(100) COMMENT '参数键，全局唯一', `paramKey` varchar(100) COMMENT '参数键，全局唯一',
`paramValue` varchar(2000) COMMENT '参数值', `paramValue` varchar(2000) COMMENT '参数值',
`validStatus` tinyint(2) COMMENT '参数有效状态，0：禁用，1：启用，默认1', `validStatus` tinyint(2) COMMENT '参数有效状态，(0.禁用，1.启用)',
`modStatus` tinyint(2) COMMENT '参数修改状态，0：隐藏，1：页面仅查看，2：页面可修改，3：页面可删除，4：页面可修改删除，默认4', `modStatus` tinyint(2) COMMENT '参数修改状态(0.隐藏，1.页面仅查看，2.页面可修改，3.页面可删除，4.页面可修改删除)',
`displayType` tinyint(2) COMMENT '展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，默认：0', `displayType` tinyint(2) COMMENT '展现类型(0.普通文本框，1.多行文本框，2.开关，3.块输入框)',
`remark` varchar(200) COMMENT '备注', `remark` varchar(200) COMMENT '备注',
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户', `createUserId` bigint(20) COMMENT '创建用户',
`createUserName` varchar(50) COMMENT '创建用户名称', `createUserName` varchar(50) COMMENT '创建用户名称',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='参数信息业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='参数信息业务';
-- ---------------------------- -- ----------------------------
-- 资源信息业务表 -- 资源信息业务表
-- ---------------------------- -- ----------------------------
...@@ -66,6 +63,7 @@ CREATE TABLE mortals_xhx_resource( ...@@ -66,6 +63,7 @@ CREATE TABLE mortals_xhx_resource(
`userType` tinyint(2) COMMENT '用户类型(0.系统用户,1.代理商用户,2.品牌商用户)', `userType` tinyint(2) COMMENT '用户类型(0.系统用户,1.代理商用户,2.品牌商用户)',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='资源信息业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='资源信息业务';
-- ---------------------------- -- ----------------------------
-- 角色信息业务表 -- 角色信息业务表
-- ---------------------------- -- ----------------------------
...@@ -74,12 +72,13 @@ CREATE TABLE mortals_xhx_role( ...@@ -74,12 +72,13 @@ CREATE TABLE mortals_xhx_role(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长', `id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`name` varchar(50) COMMENT '角色名称', `name` varchar(50) COMMENT '角色名称',
`remark` varchar(200) COMMENT '备注', `remark` varchar(200) COMMENT '备注',
`roleType` tinyint(2) COMMENT '角色类型，0：系统内置角色（不可删除），1：默认系统角色，2：普通角色，默认2', `roleType` tinyint(2) COMMENT '角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)',
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户', `createUserId` bigint(20) COMMENT '创建用户',
`createUserName` varchar(50) COMMENT '创建用户名称', `createUserName` varchar(50) COMMENT '创建用户名称',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色信息业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色信息业务';
-- ---------------------------- -- ----------------------------
-- 角色资源权限业务表 -- 角色资源权限业务表
-- ---------------------------- -- ----------------------------
...@@ -90,6 +89,7 @@ CREATE TABLE mortals_xhx_role_auth( ...@@ -90,6 +89,7 @@ CREATE TABLE mortals_xhx_role_auth(
`resourceId` bigint(20) COMMENT '资源ID', `resourceId` bigint(20) COMMENT '资源ID',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色资源权限业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色资源权限业务';
-- ---------------------------- -- ----------------------------
-- 角色用户业务表 -- 角色用户业务表
-- ---------------------------- -- ----------------------------
...@@ -100,6 +100,7 @@ CREATE TABLE mortals_xhx_role_user( ...@@ -100,6 +100,7 @@ CREATE TABLE mortals_xhx_role_user(
`userId` bigint(20) COMMENT '用户ID', `userId` bigint(20) COMMENT '用户ID',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色用户业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色用户业务';
-- ---------------------------- -- ----------------------------
-- 分索引信息业务表 -- 分索引信息业务表
-- ---------------------------- -- ----------------------------
...@@ -111,6 +112,7 @@ CREATE TABLE mortals_xhx_table_index( ...@@ -111,6 +112,7 @@ CREATE TABLE mortals_xhx_table_index(
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='分索引信息业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='分索引信息业务';
-- ---------------------------- -- ----------------------------
-- 任务信息业务表 -- 任务信息业务表
-- ---------------------------- -- ----------------------------
...@@ -135,6 +137,7 @@ CREATE TABLE mortals_xhx_task( ...@@ -135,6 +137,7 @@ CREATE TABLE mortals_xhx_task(
`createUserName` varchar(50) COMMENT '创建用户名称', `createUserName` varchar(50) COMMENT '创建用户名称',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='任务信息业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='任务信息业务';
-- ---------------------------- -- ----------------------------
-- 上传文件业务表 -- 上传文件业务表
-- ---------------------------- -- ----------------------------
...@@ -148,31 +151,6 @@ CREATE TABLE mortals_xhx_uploadfile( ...@@ -148,31 +151,6 @@ CREATE TABLE mortals_xhx_uploadfile(
`createUser` varchar(50) COMMENT '创建用户', `createUser` varchar(50) COMMENT '创建用户',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='上传文件业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='上传文件业务';
-- ----------------------------
-- 用户信息业务表
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_user`;
CREATE TABLE mortals_xhx_user(
`id` bigint(20) AUTO_INCREMENT COMMENT '用户ID，主键，自增长',
`loginName` varchar(50) COMMENT '登录名',
`loginPwd` varchar(128) COMMENT '登录密码，使用md5双次加密',
`loginLimitAddress` varchar(200) COMMENT '登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录',
`realName` varchar(50) COMMENT '用户名',
`mobile` varchar(21) COMMENT '用户手机号',
`phone` varchar(21) COMMENT '用户联系电话',
`email` varchar(50) COMMENT '用户邮箱',
`qq` varchar(20) COMMENT 'QQ号码',
`userType` tinyint(2) COMMENT '用户类型，0：系统用户 1:普通用户 2:工作人员，默认2',
`siteIds` varchar(512) COMMENT '所属站点id,多个逗号分隔',
`status` tinyint(2) COMMENT '用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1',
`customerId` bigint(20) COMMENT '客户ID',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`createUserName` varchar(50) COMMENT '创建用户名称',
`lastLoginTime` datetime COMMENT '最后一次登录时间',
`lastLoginAddress` varchar(21) COMMENT '最后一次登录地址',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户信息业务';
-- ---------------------------- -- ----------------------------
-- 验证码信息业务表 -- 验证码信息业务表
...@@ -184,13 +162,14 @@ CREATE TABLE mortals_xhx_valid_code( ...@@ -184,13 +162,14 @@ CREATE TABLE mortals_xhx_valid_code(
`url` varchar(500) COMMENT '校验地址，email校验使用', `url` varchar(500) COMMENT '校验地址，email校验使用',
`mobile` varchar(21) COMMENT '校验手机号', `mobile` varchar(21) COMMENT '校验手机号',
`email` varchar(50) COMMENT '校验邮箱', `email` varchar(50) COMMENT '校验邮箱',
`type` tinyint(2) COMMENT '校验方式，0：图片校验，1：手机校验，2：邮箱校验，默认0', `type` tinyint(2) COMMENT '校验方式(0.图片校验，1.手机校验，2.邮箱校验)',
`sessionId` varchar(50) COMMENT '会话ID', `sessionId` varchar(50) COMMENT '会话ID',
`ip` varchar(50) COMMENT 'IP地址', `ip` varchar(50) COMMENT 'IP地址',
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`lapseTime` datetime COMMENT '失效时间', `lapseTime` datetime COMMENT '失效时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='验证码信息业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='验证码信息业务';
-- ---------------------------- -- ----------------------------
-- API服务表 -- API服务表
-- ---------------------------- -- ----------------------------
...@@ -203,12 +182,13 @@ CREATE TABLE mortals_xhx_system_service_api( ...@@ -203,12 +182,13 @@ CREATE TABLE mortals_xhx_system_service_api(
`apiName` varchar(20) COMMENT 'API接口名称', `apiName` varchar(20) COMMENT 'API接口名称',
`apiUrl` varchar(200) COMMENT 'API接口（链接）', `apiUrl` varchar(200) COMMENT 'API接口（链接）',
`apiVersion` varchar(5) COMMENT 'API接口版本', `apiVersion` varchar(5) COMMENT 'API接口版本',
`apiStatus` tinyint(2) COMMENT 'API接口状态,1:启用,0:停用', `apiStatus` tinyint(2) COMMENT 'API接口状态(1:启用,0:停用)',
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`lapseTime` datetime COMMENT '失效时间', `lapseTime` datetime COMMENT '失效时间',
`apiRemark` varchar(200) COMMENT 'API接口说明', `apiRemark` varchar(200) COMMENT 'API接口说明',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='API服务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='API服务';
-- ---------------------------- -- ----------------------------
-- API服务表 -- API服务表
-- ---------------------------- -- ----------------------------
...@@ -221,12 +201,13 @@ CREATE TABLE mortals_xhx_system_service( ...@@ -221,12 +201,13 @@ CREATE TABLE mortals_xhx_system_service(
`packageName` varchar(20) COMMENT '包名称', `packageName` varchar(20) COMMENT '包名称',
`packagePath` varchar(200) COMMENT '包的下载路径', `packagePath` varchar(200) COMMENT '包的下载路径',
`packageVersion` varchar(5) COMMENT '包的版本', `packageVersion` varchar(5) COMMENT '包的版本',
`apiStatus` tinyint(2) COMMENT '包的状态,1:启用,0:停用', `apiStatus` tinyint(2) COMMENT '包的状态(1:启用,0:停用)',
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`lapseTime` datetime COMMENT '失效时间', `lapseTime` datetime COMMENT '失效时间',
`packageRemark` varchar(200) COMMENT '包的说明', `packageRemark` varchar(200) COMMENT '包的说明',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='API服务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='API服务';
-- ---------------------------- -- ----------------------------
-- 菜单信息业务表 -- 菜单信息业务表
-- ---------------------------- -- ----------------------------
...@@ -237,16 +218,16 @@ CREATE TABLE mortals_xhx_menu( ...@@ -237,16 +218,16 @@ CREATE TABLE mortals_xhx_menu(
`url` varchar(256) COMMENT '连接地址', `url` varchar(256) COMMENT '连接地址',
`parentId` bigint(20) COMMENT '父菜单ID，一级菜单的该字段值为-1', `parentId` bigint(20) COMMENT '父菜单ID，一级菜单的该字段值为-1',
`orderId` int(11) COMMENT '排序编号', `orderId` int(11) COMMENT '排序编号',
`status` tinyint(2) COMMENT '菜单状态，0：禁用，1：启用，默认1', `status` tinyint(2) COMMENT '菜单状态(0.禁用，1.启用)',
`linkType` tinyint(2) COMMENT '链接方式，0：普通，1：弹出，2：脚本（JavaScript），默认0', `linkType` tinyint(2) COMMENT '链接方式，(0.普通，1.弹出，2.脚本)',
`groupId` int(11) COMMENT '分组编号，使用菜单分隔符按该值分隔，默认1', `groupId` int(11) COMMENT '分组编号，使用菜单分隔符按该值分隔，默认1',
`groupName` varchar(255) COMMENT '', `groupName` varchar(255) COMMENT '',
`imgPath` varchar(128) COMMENT '主菜单图标，主菜单图标的css样式名', `imgPath` varchar(128) COMMENT '主菜单图标，主菜单图标的css样式名',
`buttonImgPath` varchar(128) COMMENT '按钮图标，按钮图标的css样式名', `buttonImgPath` varchar(128) COMMENT '按钮图标，按钮图标的css样式名',
`imgCommPath` varchar(128) COMMENT '常用菜单图标，常用菜单图标的css样式名', `imgCommPath` varchar(128) COMMENT '常用菜单图标，常用菜单图标的css样式名',
`commMenu` tinyint(2) COMMENT '是否常用菜单，0：非常用，1：常用，默认0', `commMenu` tinyint(2) COMMENT '是否常用菜单(0.非常用，1：常用)',
`menuType` tinyint(2) COMMENT '菜单类型，0：主菜单，1：非主菜单，默认0', `menuType` tinyint(2) COMMENT '菜单类型(0.主菜单，1.非主菜单)',
`authType` tinyint(2) COMMENT '权限类型，0：无限制，1：无需登录查看，2：需要登录查看，3：需要角色权限查看', `authType` tinyint(2) COMMENT '权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)',
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户', `createUserId` bigint(20) COMMENT '创建用户',
`createUserName` varchar(50) COMMENT '创建用户名称', `createUserName` varchar(50) COMMENT '创建用户名称',
...@@ -254,9 +235,41 @@ PRIMARY KEY (`id`) ...@@ -254,9 +235,41 @@ PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='菜单信息业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='菜单信息业务';
-- ---------------------------- -- ----------------------------
-- Records of mortals_xhx_idgenerator -- 系统模块表
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_idgenerator` VALUES (1, 'INFO_VERSION_KEY', 1, '基础信息版本号生成因子', 0, now()); DROP TABLE IF EXISTS `mortals_sys_model`;
CREATE TABLE mortals_sys_model(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`modelName` varchar(64) COMMENT '系统模块名称',
`modelCode` varchar(64) COMMENT '模块编码',
`modelIcon` varchar(64) COMMENT '模块图标',
`modelUrl` varchar(64) COMMENT '地址',
`remark` varchar(64) COMMENT '备注信息',
`sort` int(4) COMMENT '排序',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
`updateUserId` bigint(20) COMMENT '修改用户',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统模块';
-- ----------------------------
-- 操作日志业务表
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_oper_log`;
CREATE TABLE mortals_xhx_oper_log(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`platformMark` varchar(50) COMMENT '平台标识',
`userId` bigint(20) COMMENT '用户id',
`userName` varchar(50) COMMENT '用户名称',
`loginName` varchar(50) COMMENT '用户登录名',
`requestUrl` varchar(200) COMMENT '请求地址',
`content` varchar(2000) COMMENT '操作内容，记录操作具体信息，如修改前修改或的数据',
`ip` varchar(30) COMMENT '操作IP地址',
`logDate` datetime COMMENT '操作时间',
`operType` tinyint(2) COMMENT '操作类型，(0.新增,1.修改,2.删除)',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='操作日志业务';
-- ---------------------------- -- ----------------------------
-- Records of mortals_xhx_role -- Records of mortals_xhx_role
...@@ -267,4 +280,4 @@ INSERT INTO `mortals_xhx_role` VALUES (1, '管理员', '类似admin', 0, now(), ...@@ -267,4 +280,4 @@ INSERT INTO `mortals_xhx_role` VALUES (1, '管理员', '类似admin', 0, now(),
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_task` VALUES (2, '分表创建任务', 'tableIndexService', 0, 'tableIndexService', NULL, NULL, 1, 0, '00:30', NULL, '192.168.1.106', '2021-08-18 00:30:01', 0, '2021-08-12 11:07:23', 1, '系统管理员'); INSERT INTO `mortals_xhx_task` VALUES (2, '分表创建任务', 'tableIndexService', 0, 'tableIndexService', NULL, NULL, 1, 0, '00:30', NULL, '192.168.1.106', '2021-08-18 00:30:01', 0, '2021-08-12 11:07:23', 1, '系统管理员');
INSERT INTO `mortals_xhx_user` VALUES (1, 'admin', '43442676c74ae59f219c2d87fd6bad52', NULL, '系统管理员', '13808095770', NULL, NULL, NULL, 1,"", 1, 1, now(), 1, 'admin', now(), '127.0.0.1'); INSERT INTO `mortals_xhx_user` VALUES (1, 'admin', '43442676c74ae59f219c2d87fd6bad52', NULL, '系统管理员', '13808095770', NULL, NULL, NULL, 1,"","","", 1, 1, now(), 1, 'admin', now(), '127.0.0.1');
portal-manager/db/menu.sql
View file @ 6cb61c56
-- ---------------------------- -- ----------------------------
-- 操作日志业务菜单 SQL -- 用户信息业务菜单 SQL
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_menu` VALUES (null, '操作日志业务', '/oper/log/list', 0, 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL); INSERT INTO `mortals_xhx_menu` VALUES (null, '用户信息业务', '/user/list', 0, 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- 操作日志业务资源路径 SQL -- 用户信息业务资源路径 SQL
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '操作日志业务-菜单管理-查看', '/oper/log/list,/oper/log/view,/oper/log/info,/oper/log/export,/oper/log/exportExcel,/oper/log/downloadTemplate,/oper/log/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '用户信息业务-菜单管理-查看', '/user/list,/user/view,/user/info,/user/export,/user/exportExcel,/user/downloadTemplate,/user/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '操作日志业务-菜单管理-维护', '/oper/log/add,/oper/log/edit,/oper/log/delete,/oper/log/logicDelete,/oper/log/save,/oper/log/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '用户信息业务-菜单管理-维护', '/user/add,/user/edit,/user/delete,/user/logicDelete,/user/save,/user/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- 用户信息业务参数 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_param` VALUES (null, '用户类型', 'User', 'userType', '0', '系统用户', 1, 4, 0, 'userType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '用户类型', 'User', 'userType', '1', '普通用户', 1, 4, 0, 'userType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '用户类型', 'User', 'userType', '2', '工作人员', 1, 4, 0, 'userType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '用户状态', 'User', 'status', '0', '停用', 1, 4, 0, 'status', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '用户状态', 'User', 'status', '1', '正常', 1, 4, 0, 'status', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '用户状态', 'User', 'status', '2', '冻结', 1, 4, 0, 'status', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '用户状态', 'User', 'status', '3', '销户', 1, 4, 0, 'status', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '用户状态', 'User', 'status', '4', '离职', 1, 4, 0, 'status', NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- 参数信息业务菜单 SQL -- 参数信息业务菜单 SQL
-- ---------------------------- -- ----------------------------
...@@ -18,6 +30,21 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '参数信息业务', '/param/list' ...@@ -18,6 +30,21 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '参数信息业务', '/param/list'
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '参数信息业务-菜单管理-查看', '/param/list,/param/view,/param/info,/param/export,/param/exportExcel,/param/downloadTemplate,/param/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '参数信息业务-菜单管理-查看', '/param/list,/param/view,/param/info,/param/export,/param/exportExcel,/param/downloadTemplate,/param/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '参数信息业务-菜单管理-维护', '/param/add,/param/edit,/param/delete,/param/logicDelete,/param/save,/param/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '参数信息业务-菜单管理-维护', '/param/add,/param/edit,/param/delete,/param/logicDelete,/param/save,/param/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- 参数信息业务参数 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_param` VALUES (null, '参数有效状态，', 'Param', 'validStatus', '0', '禁用', 1, 4, 0, 'validStatus', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '参数有效状态，', 'Param', 'validStatus', '1', '启用', 1, 4, 0, 'validStatus', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '参数修改状态', 'Param', 'modStatus', '0', '隐藏', 1, 4, 0, 'modStatus', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '参数修改状态', 'Param', 'modStatus', '1', '页面仅查看', 1, 4, 0, 'modStatus', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '参数修改状态', 'Param', 'modStatus', '2', '页面可修改', 1, 4, 0, 'modStatus', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '参数修改状态', 'Param', 'modStatus', '3', '页面可删除', 1, 4, 0, 'modStatus', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '参数修改状态', 'Param', 'modStatus', '4', '页面可修改删除', 1, 4, 0, 'modStatus', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '展现类型', 'Param', 'displayType', '0', '普通文本框', 1, 4, 0, 'displayType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '展现类型', 'Param', 'displayType', '1', '多行文本框', 1, 4, 0, 'displayType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '展现类型', 'Param', 'displayType', '2', '开关', 1, 4, 0, 'displayType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '展现类型', 'Param', 'displayType', '3', '块输入框', 1, 4, 0, 'displayType', NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- 资源信息业务菜单 SQL -- 资源信息业务菜单 SQL
-- ---------------------------- -- ----------------------------
...@@ -28,6 +55,19 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '资源信息业务', '/resource/li ...@@ -28,6 +55,19 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '资源信息业务', '/resource/li
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '资源信息业务-菜单管理-查看', '/resource/list,/resource/view,/resource/info,/resource/export,/resource/exportExcel,/resource/downloadTemplate,/resource/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '资源信息业务-菜单管理-查看', '/resource/list,/resource/view,/resource/info,/resource/export,/resource/exportExcel,/resource/downloadTemplate,/resource/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '资源信息业务-菜单管理-维护', '/resource/add,/resource/edit,/resource/delete,/resource/logicDelete,/resource/save,/resource/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '资源信息业务-菜单管理-维护', '/resource/add,/resource/edit,/resource/delete,/resource/logicDelete,/resource/save,/resource/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- 资源信息业务参数 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_param` VALUES (null, '权限类型', 'Resource', 'authType', '0', '无限制', 1, 4, 0, 'authType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '权限类型', 'Resource', 'authType', '1', '无需登录查看', 1, 4, 0, 'authType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '权限类型', 'Resource', 'authType', '2', '需要登录查看', 1, 4, 0, 'authType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '权限类型', 'Resource', 'authType', '3', '需要角色权限查看', 1, 4, 0, 'authType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '资源类型', 'Resource', 'sourceType', '0', '系统资源', 1, 4, 0, 'sourceType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '资源类型', 'Resource', 'sourceType', '1', '开放资源', 1, 4, 0, 'sourceType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '用户类型', 'Resource', 'userType', '0', '系统用户', 1, 4, 0, 'userType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '用户类型', 'Resource', 'userType', '1', '代理商用户', 1, 4, 0, 'userType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '用户类型', 'Resource', 'userType', '2', '品牌商用户', 1, 4, 0, 'userType', NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- 角色信息业务菜单 SQL -- 角色信息业务菜单 SQL
-- ---------------------------- -- ----------------------------
...@@ -38,6 +78,13 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '角色信息业务', '/role/list', ...@@ -38,6 +78,13 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '角色信息业务', '/role/list',
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '角色信息业务-菜单管理-查看', '/role/list,/role/view,/role/info,/role/export,/role/exportExcel,/role/downloadTemplate,/role/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '角色信息业务-菜单管理-查看', '/role/list,/role/view,/role/info,/role/export,/role/exportExcel,/role/downloadTemplate,/role/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '角色信息业务-菜单管理-维护', '/role/add,/role/edit,/role/delete,/role/logicDelete,/role/save,/role/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '角色信息业务-菜单管理-维护', '/role/add,/role/edit,/role/delete,/role/logicDelete,/role/save,/role/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- 角色信息业务参数 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_param` VALUES (null, '角色类型', 'Role', 'roleType', '0', '系统内置角色', 1, 4, 0, 'roleType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '角色类型', 'Role', 'roleType', '1', '默认系统角色', 1, 4, 0, 'roleType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '角色类型', 'Role', 'roleType', '2', '普通角色', 1, 4, 0, 'roleType', NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- 角色资源权限业务菜单 SQL -- 角色资源权限业务菜单 SQL
-- ---------------------------- -- ----------------------------
...@@ -48,6 +95,10 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '角色资源权限业务', '/role/ ...@@ -48,6 +95,10 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '角色资源权限业务', '/role/
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '角色资源权限业务-菜单管理-查看', '/role/auth/list,/role/auth/view,/role/auth/info,/role/auth/export,/role/auth/exportExcel,/role/auth/downloadTemplate,/role/auth/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '角色资源权限业务-菜单管理-查看', '/role/auth/list,/role/auth/view,/role/auth/info,/role/auth/export,/role/auth/exportExcel,/role/auth/downloadTemplate,/role/auth/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '角色资源权限业务-菜单管理-维护', '/role/auth/add,/role/auth/edit,/role/auth/delete,/role/auth/logicDelete,/role/auth/save,/role/auth/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '角色资源权限业务-菜单管理-维护', '/role/auth/add,/role/auth/edit,/role/auth/delete,/role/auth/logicDelete,/role/auth/save,/role/auth/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- 角色资源权限业务参数 SQL
-- ----------------------------
-- ---------------------------- -- ----------------------------
-- 角色用户业务菜单 SQL -- 角色用户业务菜单 SQL
-- ---------------------------- -- ----------------------------
...@@ -58,6 +109,10 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '角色用户业务', '/role/user/l ...@@ -58,6 +109,10 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '角色用户业务', '/role/user/l
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '角色用户业务-菜单管理-查看', '/role/user/list,/role/user/view,/role/user/info,/role/user/export,/role/user/exportExcel,/role/user/downloadTemplate,/role/user/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '角色用户业务-菜单管理-查看', '/role/user/list,/role/user/view,/role/user/info,/role/user/export,/role/user/exportExcel,/role/user/downloadTemplate,/role/user/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '角色用户业务-菜单管理-维护', '/role/user/add,/role/user/edit,/role/user/delete,/role/user/logicDelete,/role/user/save,/role/user/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '角色用户业务-菜单管理-维护', '/role/user/add,/role/user/edit,/role/user/delete,/role/user/logicDelete,/role/user/save,/role/user/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- 角色用户业务参数 SQL
-- ----------------------------
-- ---------------------------- -- ----------------------------
-- 分索引信息业务菜单 SQL -- 分索引信息业务菜单 SQL
-- ---------------------------- -- ----------------------------
...@@ -68,6 +123,10 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '分索引信息业务', '/table/in ...@@ -68,6 +123,10 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '分索引信息业务', '/table/in
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '分索引信息业务-菜单管理-查看', '/table/index/list,/table/index/view,/table/index/info,/table/index/export,/table/index/exportExcel,/table/index/downloadTemplate,/table/index/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '分索引信息业务-菜单管理-查看', '/table/index/list,/table/index/view,/table/index/info,/table/index/export,/table/index/exportExcel,/table/index/downloadTemplate,/table/index/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '分索引信息业务-菜单管理-维护', '/table/index/add,/table/index/edit,/table/index/delete,/table/index/logicDelete,/table/index/save,/table/index/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '分索引信息业务-菜单管理-维护', '/table/index/add,/table/index/edit,/table/index/delete,/table/index/logicDelete,/table/index/save,/table/index/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- 分索引信息业务参数 SQL
-- ----------------------------
-- ---------------------------- -- ----------------------------
-- 任务信息业务菜单 SQL -- 任务信息业务菜单 SQL
-- ---------------------------- -- ----------------------------
...@@ -78,6 +137,18 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '任务信息业务', '/task/list', ...@@ -78,6 +137,18 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '任务信息业务', '/task/list',
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '任务信息业务-菜单管理-查看', '/task/list,/task/view,/task/info,/task/export,/task/exportExcel,/task/downloadTemplate,/task/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '任务信息业务-菜单管理-查看', '/task/list,/task/view,/task/info,/task/export,/task/exportExcel,/task/downloadTemplate,/task/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '任务信息业务-菜单管理-维护', '/task/add,/task/edit,/task/delete,/task/logicDelete,/task/save,/task/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '任务信息业务-菜单管理-维护', '/task/add,/task/edit,/task/delete,/task/logicDelete,/task/save,/task/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- 任务信息业务参数 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_param` VALUES (null, '任务状态，', 'Task', 'status', '1', '执行中', 1, 4, 0, 'status', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '执行策略', 'Task', 'excuteStrategy', '1', '按日', 1, 4, 0, 'excuteStrategy', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '执行策略', 'Task', 'excuteStrategy', '2', '按周', 1, 4, 0, 'excuteStrategy', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '执行策略', 'Task', 'excuteStrategy', '3', '按月', 1, 4, 0, 'excuteStrategy', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '执行策略', 'Task', 'excuteStrategy', '4', '按间隔时间', 1, 4, 0, 'excuteStrategy', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '临时执行状态，', 'Task', 'interimExcuteStatus', '0', '未启用', 1, 4, 0, 'interimExcuteStatus', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '临时执行状态，', 'Task', 'interimExcuteStatus', '1', '立即执行并保留', 1, 4, 0, 'interimExcuteStatus', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '临时执行状态，', 'Task', 'interimExcuteStatus', '2', '立即执行并删除', 1, 4, 0, 'interimExcuteStatus', NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- 上传文件业务菜单 SQL -- 上传文件业务菜单 SQL
-- ---------------------------- -- ----------------------------
...@@ -88,16 +159,14 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '上传文件业务', '/uploadfile/ ...@@ -88,16 +159,14 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '上传文件业务', '/uploadfile/
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '上传文件业务-菜单管理-查看', '/uploadfile/list,/uploadfile/view,/uploadfile/info,/uploadfile/export,/uploadfile/exportExcel,/uploadfile/downloadTemplate,/uploadfile/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '上传文件业务-菜单管理-查看', '/uploadfile/list,/uploadfile/view,/uploadfile/info,/uploadfile/export,/uploadfile/exportExcel,/uploadfile/downloadTemplate,/uploadfile/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '上传文件业务-菜单管理-维护', '/uploadfile/add,/uploadfile/edit,/uploadfile/delete,/uploadfile/logicDelete,/uploadfile/save,/uploadfile/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '上传文件业务-菜单管理-维护', '/uploadfile/add,/uploadfile/edit,/uploadfile/delete,/uploadfile/logicDelete,/uploadfile/save,/uploadfile/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- 用户信息业务菜单 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_menu` VALUES (null, '用户信息业务', '/user/list', 0, 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- 用户信息业务资源路径 SQL -- 上传文件业务参数 SQL
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '用户信息业务-菜单管理-查看', '/user/list,/user/view,/user/info,/user/export,/user/exportExcel,/user/downloadTemplate,/user/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_param` VALUES (null, '文件类型，', 'Uploadfile', 'fileType', '1', 'excel', 1, 4, 0, 'fileType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_resource` VALUES (null, '用户信息业务-菜单管理-维护', '/user/add,/user/edit,/user/delete,/user/logicDelete,/user/save,/user/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_param` VALUES (null, '文件类型，', 'Uploadfile', 'fileType', '2', 'img', 1, 4, 0, 'fileType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '文件类型，', 'Uploadfile', 'fileType', '3', 'zip', 1, 4, 0, 'fileType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '文件类型，', 'Uploadfile', 'fileType', '4', 'pdf', 1, 4, 0, 'fileType', NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- 验证码信息业务菜单 SQL -- 验证码信息业务菜单 SQL
-- ---------------------------- -- ----------------------------
...@@ -108,6 +177,13 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '验证码信息业务', '/valid/co ...@@ -108,6 +177,13 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '验证码信息业务', '/valid/co
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '验证码信息业务-菜单管理-查看', '/valid/code/list,/valid/code/view,/valid/code/info,/valid/code/export,/valid/code/exportExcel,/valid/code/downloadTemplate,/valid/code/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '验证码信息业务-菜单管理-查看', '/valid/code/list,/valid/code/view,/valid/code/info,/valid/code/export,/valid/code/exportExcel,/valid/code/downloadTemplate,/valid/code/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '验证码信息业务-菜单管理-维护', '/valid/code/add,/valid/code/edit,/valid/code/delete,/valid/code/logicDelete,/valid/code/save,/valid/code/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '验证码信息业务-菜单管理-维护', '/valid/code/add,/valid/code/edit,/valid/code/delete,/valid/code/logicDelete,/valid/code/save,/valid/code/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- 验证码信息业务参数 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_param` VALUES (null, '校验方式', 'ValidCode', 'type', '0', '图片校验', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '校验方式', 'ValidCode', 'type', '1', '手机校验', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '校验方式', 'ValidCode', 'type', '2', '邮箱校验', 1, 4, 0, 'type', NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- API服务菜单 SQL -- API服务菜单 SQL
-- ---------------------------- -- ----------------------------
...@@ -118,6 +194,10 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, 'API服务', '/system/service/api/l ...@@ -118,6 +194,10 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, 'API服务', '/system/service/api/l
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, 'API服务-菜单管理-查看', '/system/service/api/list,/system/service/api/view,/system/service/api/info,/system/service/api/export,/system/service/api/exportExcel,/system/service/api/downloadTemplate,/system/service/api/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, 'API服务-菜单管理-查看', '/system/service/api/list,/system/service/api/view,/system/service/api/info,/system/service/api/export,/system/service/api/exportExcel,/system/service/api/downloadTemplate,/system/service/api/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, 'API服务-菜单管理-维护', '/system/service/api/add,/system/service/api/edit,/system/service/api/delete,/system/service/api/logicDelete,/system/service/api/save,/system/service/api/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, 'API服务-菜单管理-维护', '/system/service/api/add,/system/service/api/edit,/system/service/api/delete,/system/service/api/logicDelete,/system/service/api/save,/system/service/api/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- API服务参数 SQL
-- ----------------------------
-- ---------------------------- -- ----------------------------
-- API服务菜单 SQL -- API服务菜单 SQL
-- ---------------------------- -- ----------------------------
...@@ -128,6 +208,10 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, 'API服务', '/system/service/list' ...@@ -128,6 +208,10 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, 'API服务', '/system/service/list'
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, 'API服务-菜单管理-查看', '/system/service/list,/system/service/view,/system/service/info,/system/service/export,/system/service/exportExcel,/system/service/downloadTemplate,/system/service/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, 'API服务-菜单管理-查看', '/system/service/list,/system/service/view,/system/service/info,/system/service/export,/system/service/exportExcel,/system/service/downloadTemplate,/system/service/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, 'API服务-菜单管理-维护', '/system/service/add,/system/service/edit,/system/service/delete,/system/service/logicDelete,/system/service/save,/system/service/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, 'API服务-菜单管理-维护', '/system/service/add,/system/service/edit,/system/service/delete,/system/service/logicDelete,/system/service/save,/system/service/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- API服务参数 SQL
-- ----------------------------
-- ---------------------------- -- ----------------------------
-- 菜单信息业务菜单 SQL -- 菜单信息业务菜单 SQL
-- ---------------------------- -- ----------------------------
...@@ -138,3 +222,50 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '菜单信息业务', '/menu/list', ...@@ -138,3 +222,50 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '菜单信息业务', '/menu/list',
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '菜单信息业务-菜单管理-查看', '/menu/list,/menu/view,/menu/info,/menu/export,/menu/exportExcel,/menu/downloadTemplate,/menu/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '菜单信息业务-菜单管理-查看', '/menu/list,/menu/view,/menu/info,/menu/export,/menu/exportExcel,/menu/downloadTemplate,/menu/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '菜单信息业务-菜单管理-维护', '/menu/add,/menu/edit,/menu/delete,/menu/logicDelete,/menu/save,/menu/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '菜单信息业务-菜单管理-维护', '/menu/add,/menu/edit,/menu/delete,/menu/logicDelete,/menu/save,/menu/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- 菜单信息业务参数 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_param` VALUES (null, '菜单状态', 'Menu', 'status', '0', '禁用', 1, 4, 0, 'status', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '菜单状态', 'Menu', 'status', '1', '启用', 1, 4, 0, 'status', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '链接方式，', 'Menu', 'linkType', '0', '普通', 1, 4, 0, 'linkType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '链接方式，', 'Menu', 'linkType', '1', '弹出', 1, 4, 0, 'linkType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '链接方式，', 'Menu', 'linkType', '2', '脚本', 1, 4, 0, 'linkType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '是否常用菜单', 'Menu', 'commMenu', '0', '非常用', 1, 4, 0, 'commMenu', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '菜单类型', 'Menu', 'menuType', '0', '主菜单', 1, 4, 0, 'menuType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '菜单类型', 'Menu', 'menuType', '1', '非主菜单', 1, 4, 0, 'menuType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '权限类型', 'Menu', 'authType', '0', '无限制', 1, 4, 0, 'authType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '权限类型', 'Menu', 'authType', '1', '无需登录查看', 1, 4, 0, 'authType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '权限类型', 'Menu', 'authType', '2', '需要登录查看', 1, 4, 0, 'authType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '权限类型', 'Menu', 'authType', '3', '需要角色权限查看', 1, 4, 0, 'authType', NULL, NULL, NULL);
-- ----------------------------
-- 系统模块菜单 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_menu` VALUES (null, '系统模块', '/model/list', 0, 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
-- ----------------------------
-- 系统模块资源路径 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '系统模块-菜单管理-查看', '/model/list,/model/view,/model/info,/model/export,/model/exportExcel,/model/downloadTemplate,/model/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '系统模块-菜单管理-维护', '/model/add,/model/edit,/model/delete,/model/logicDelete,/model/save,/model/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- 系统模块参数 SQL
-- ----------------------------
-- ----------------------------
-- 操作日志业务菜单 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_menu` VALUES (null, '操作日志业务', '/oper/log/list', 0, 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
-- ----------------------------
-- 操作日志业务资源路径 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '操作日志业务-菜单管理-查看', '/oper/log/list,/oper/log/view,/oper/log/info,/oper/log/export,/oper/log/exportExcel,/oper/log/downloadTemplate,/oper/log/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '操作日志业务-菜单管理-维护', '/oper/log/add,/oper/log/edit,/oper/log/delete,/oper/log/logicDelete,/oper/log/save,/oper/log/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- 操作日志业务参数 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_param` VALUES (null, '操作类型，', 'OperLog', 'operType', '0', '新增', 1, 4, 0, 'operType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '操作类型，', 'OperLog', 'operType', '1', '修改', 1, 4, 0, 'operType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '操作类型，', 'OperLog', 'operType', '2', '删除', 1, 4, 0, 'operType', NULL, NULL, NULL);
portal-manager/db/params.sql deleted 100644 → 0
View file @ 34cd5ee0
-- ----------------------------
-- 操作日志业务参数 SQL
-- ----------------------------
-- ----------------------------
-- 参数信息业务参数 SQL
-- ----------------------------
-- ----------------------------
-- 资源信息业务参数 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_param` VALUES (null, '权限类型', 'Resource', 'authType', '0', '无限制', 1, 4, 0, 'authType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '权限类型', 'Resource', 'authType', '1', '无需登录查看', 1, 4, 0, 'authType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '权限类型', 'Resource', 'authType', '2', '需要登录查看', 1, 4, 0, 'authType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '权限类型', 'Resource', 'authType', '3', '需要角色权限查看', 1, 4, 0, 'authType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '资源类型', 'Resource', 'sourceType', '0', '系统资源', 1, 4, 0, 'sourceType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '资源类型', 'Resource', 'sourceType', '1', '开放资源', 1, 4, 0, 'sourceType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '用户类型', 'Resource', 'userType', '0', '系统用户', 1, 4, 0, 'userType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '用户类型', 'Resource', 'userType', '1', '代理商用户', 1, 4, 0, 'userType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '用户类型', 'Resource', 'userType', '2', '品牌商用户', 1, 4, 0, 'userType', NULL, NULL, NULL);
-- ----------------------------
-- 任务信息业务参数 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_param` VALUES (null, '任务状态，', 'Task', 'status', '1', '执行中', 1, 4, 0, 'status', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '执行策略', 'Task', 'excuteStrategy', '1', '按日', 1, 4, 0, 'excuteStrategy', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '执行策略', 'Task', 'excuteStrategy', '2', '按周', 1, 4, 0, 'excuteStrategy', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '执行策略', 'Task', 'excuteStrategy', '3', '按月', 1, 4, 0, 'excuteStrategy', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '执行策略', 'Task', 'excuteStrategy', '4', '按间隔时间', 1, 4, 0, 'excuteStrategy', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '临时执行状态，', 'Task', 'interimExcuteStatus', '0', '未启用', 1, 4, 0, 'interimExcuteStatus', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '临时执行状态，', 'Task', 'interimExcuteStatus', '1', '立即执行并保留', 1, 4, 0, 'interimExcuteStatus', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '临时执行状态，', 'Task', 'interimExcuteStatus', '2', '立即执行并删除', 1, 4, 0, 'interimExcuteStatus', NULL, NULL, NULL);
-- ----------------------------
-- 上传文件业务参数 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_param` VALUES (null, '文件类型，', 'Uploadfile', 'fileType', '1', 'excel', 1, 4, 0, 'fileType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '文件类型，', 'Uploadfile', 'fileType', '2', 'img', 1, 4, 0, 'fileType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '文件类型，', 'Uploadfile', 'fileType', '3', 'zip', 1, 4, 0, 'fileType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '文件类型，', 'Uploadfile', 'fileType', '4', 'pdf', 1, 4, 0, 'fileType', NULL, NULL, NULL);
portal-manager/doc/api.md
View file @ 6cb61c56
This source diff could not be displayed because it is too large. You can view the blob instead.
portal-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
View file @ 6cb61c56
...@@ -16,7 +16,10 @@ import com.mortals.framework.util.StringUtils; ...@@ -16,7 +16,10 @@ import com.mortals.framework.util.StringUtils;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.valid.service.ValidCodeService; import com.mortals.xhx.base.system.valid.service.ValidCodeService;
import com.mortals.xhx.common.key.RedisKey; import com.mortals.xhx.common.key.RedisKey;
import com.mortals.xhx.module.menu.model.MenuEntity;
import com.mortals.xhx.module.menu.service.MenuService; import com.mortals.xhx.module.menu.service.MenuService;
import com.mortals.xhx.module.model.model.ModelEntity;
import com.mortals.xhx.module.model.service.ModelService;
import com.mortals.xhx.module.resource.service.ResourceService; import com.mortals.xhx.module.resource.service.ResourceService;
import com.mortals.xhx.module.user.model.UserEntity; import com.mortals.xhx.module.user.model.UserEntity;
import com.mortals.xhx.module.user.service.UserService; import com.mortals.xhx.module.user.service.UserService;
...@@ -31,7 +34,9 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -31,7 +34,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set; import java.util.Set;
@RestController @RestController
...@@ -42,8 +47,6 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -42,8 +47,6 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
@Autowired @Autowired
private UserService userService; private UserService userService;
@Autowired @Autowired
private ValidCodeService validCodeService;
@Autowired
private ResourceService resourceService; private ResourceService resourceService;
@Autowired @Autowired
private MenuService menuService; private MenuService menuService;
...@@ -52,17 +55,16 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -52,17 +55,16 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
@Autowired @Autowired
private ICacheService cacheService; private ICacheService cacheService;
@Autowired @Autowired
private ModelService modelService;
@Autowired
private IAuthTokenService authTokenService; private IAuthTokenService authTokenService;
private static Log logger = LogFactory.getLog(LoginController.class);
@RequestMapping("login") @RequestMapping("login")
public String login(@RequestBody LoginForm loginForm) throws Exception { public String login(@RequestBody LoginForm loginForm) throws Exception {
JSONObject ret = new JSONObject(); JSONObject ret = new JSONObject();
Map<String, Object> data = new HashMap<>();
String loginName = loginForm.getLoginName(); String loginName = loginForm.getLoginName();
String password = loginForm.getPassword(); String password = loginForm.getPassword();
String securityCode = loginForm.getSecurityCode();
String ip = super.getRequestIP(request); String ip = super.getRequestIP(request);
if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) { if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) {
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE); ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
...@@ -72,55 +74,34 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -72,55 +74,34 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
UserEntity userEntity = null; UserEntity userEntity = null;
try { try {
loginForm.validate(); loginForm.validate();
boolean result = validCodeService.doCheckImageValidCode(request.getSession().getId(), ip, securityCode);
if ("8888".equals(securityCode)) {
result = true;
}
if (!result) {
recordSysLog(request, userEntity, "登录验证码不正确或已过期!");
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, "登录验证码不正确或已过期!");
return ret.toJSONString();
}
userEntity = userService.doLogin(loginName, password, ip); userEntity = userService.doLogin(loginName, password, ip);
userEntity.setLastLoginAddress(ip); userEntity.setLastLoginAddress(ip);
recordSysLog(request, userEntity, "用户登录系统成功!"); recordSysLog(request, userEntity, "用户登录系统成功!");
// 返回拥有的菜单数据 // 返回拥有的菜单数据
Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId()); Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId());
//List<MenuEntity> outlookBarList = menuService.findTreeMenu(userEntity, urls); //菜单列表
String currUserName = userEntity.getRealName(); List<MenuEntity> menuList = menuService.findTreeMenu(userEntity, urls);
if (currUserName == null || currUserName.trim().length() == 0) { userEntity.setMenuList(menuList);
currUserName = "管理员"; List<ModelEntity> modelList = this.service.findModelList(userEntity.getId());
} userEntity.setModelList(modelList);
JSONObject data = new JSONObject();
data.put("currUserName", currUserName);
//data.put("barList", outlookBarList);
data.put("id", userEntity.getId());
data.put("userType", userEntity.getUserType());
userEntity.setLoginTime(System.currentTimeMillis()); userEntity.setLoginTime(System.currentTimeMillis());
userEntity.setToken(IdUtil.fastSimpleUUID()); userEntity.setToken(IdUtil.fastSimpleUUID());
userEntity.setExpireTime(DateUtils.addCurrDate(7).getTime()); userEntity.setExpireTime(DateUtils.addCurrDate(7).getTime());
userEntity.setMenuUrl(generateMenuUrlCode(urls)); userEntity.setMenuUrl(generateMenuUrlCode(urls));
String token = authTokenService.createToken(userEntity); String token = authTokenService.createToken(userEntity);
data.put("token", token);
//设置token 和过期时间
//data.put("expiresTime", DateUtils.addCurrDate(7).getTime());
generateMenuUrlCode(urls); generateMenuUrlCode(urls);
//this.generateBlackCookie(request, response, loginName, urls); //this.generateBlackCookie(request, response, loginName, urls);
data.put("token", token);
data.put("user", userEntity);
ret.put(KEY_RESULT_DATA, data); ret.put(KEY_RESULT_DATA, data);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS); ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "用户登录系统成功!"); ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
// ret.put("resources", urls); ret.put("resources", urls);
return ret.toJSONString(); return ret.toJSONString();
} catch (Exception e) { } catch (Exception e) {
log.error("login error ", e); log.error("login error ", e);
if (userEntity == null) {
userEntity = new UserEntity();
userEntity.setLoginName(loginName);
}
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE); ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, super.convertException(e)); ret.put(KEY_RESULT_MSG, super.convertException(e));
return ret.toJSONString(); return ret.toJSONString();
...@@ -128,28 +109,27 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -128,28 +109,27 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
} }
@RequestMapping("logout") @RequestMapping("logout")
public void logout(HttpServletRequest request, HttpServletResponse response) throws Exception { public void logout() throws Exception {
recordSysLog(request, "退出登录"); recordSysLog(request, "退出登录");
authTokenService.delUser(authTokenService.getToken(request));
super.removeCurrUser(request); super.removeCurrUser(request);
this.deleteBlackCookie(request, response);
} }
@RequestMapping("index") @RequestMapping("index")
public String index(HttpServletRequest request, HttpServletResponse response) throws Exception { public String index() throws Exception {
JSONObject ret = new JSONObject(); JSONObject ret = new JSONObject();
IUser user = this.getCurUser(); IUser user = this.getCurUser();
if (user == null) { if (user == null) {
return ""; return "";
} }
Set<String> urls = resourceService.findUrlSetByUserId(user.getId()); Set<String> urls = resourceService.findUrlSetByUserId(user.getId());
// List<MenuEntity> outlookBarList = menuService.findTreeMenu(user, urls); List<MenuEntity> outlookBarList = menuService.findTreeMenu(user, urls);
String currUserName = user.getRealName(); String currUserName = user.getRealName();
if (currUserName == null || currUserName.trim().length() == 0) { if (currUserName == null || currUserName.trim().length() == 0) {
currUserName = "管理员"; currUserName = "管理员";
} }
JSONObject data = new JSONObject(); JSONObject data = new JSONObject();
data.put("currUserName", currUserName); data.put("barList", outlookBarList);
// data.put("barList", outlookBarList);
data.put("id", user.getId()); data.put("id", user.getId());
data.put("userType", user.getUserType()); data.put("userType", user.getUserType());
ret.put(KEY_RESULT_DATA, data); ret.put(KEY_RESULT_DATA, data);
...@@ -203,56 +183,6 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -203,56 +183,6 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
} }
} }
@RequestMapping("validcode")
public String validCode(HttpServletRequest request, HttpServletResponse response, LoginForm loginForm) {
JSONObject ret = new JSONObject();
String loginName = loginForm.getLoginName();
String password = loginForm.getPassword();
if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) {
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, "登录名或密码为空");
}
UserEntity user = null;
try {
user = userService.doCheckUser(loginName, password);
if (user == null) {
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, "用户名或密码不正确");
} else if (StringUtils.isEmpty(user.getMobile())) {
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, "用户无正确的手机号");
} else {
String mobile = StringUtils.trim(user.getMobile());
String sessionId = request.getSession().getId();
String ip = super.getRequestIP(request);
boolean result = validCodeService.createSmsValidCode(sessionId, ip, mobile);
if (result) {
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
} else {
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, "验证码发送失败，请稍后在试！");
}
}
} catch (Exception e) {
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, "验证码发送失败：" + super.convertException(e));
} finally {
if (user == null) {
user = new UserEntity();
user.setLoginName(loginName);
}
recordSysLog(request, user, "用户获取短信验证码");
}
return ret.toJSONString();
}
protected void deleteBlackCookie(HttpServletRequest request, HttpServletResponse response) {
try {
CookieService.deleteCookieForAuth(request, response);
} catch (Throwable e) {
}
}
@RequestMapping("parseToken") @RequestMapping("parseToken")
public IUser parseToken() throws Exception { public IUser parseToken() throws Exception {
......
portal-manager/src/main/java/com/mortals/xhx/base/login/web/LoginForm.java
View file @ 6cb61c56
...@@ -11,11 +11,10 @@ public class LoginForm { ...@@ -11,11 +11,10 @@ public class LoginForm {
private String password; private String password;
private String securityCode;
@Override @Override
public String toString() { public String toString() {
return "loginName:" + this.loginName + " password:" + this.password + " securityCode:" + this.securityCode; return "loginName:" + this.loginName + " password:" + this.password;
} }
public boolean validate() throws AppException { public boolean validate() throws AppException {
...@@ -25,9 +24,6 @@ public class LoginForm { ...@@ -25,9 +24,6 @@ public class LoginForm {
if (password == null || password.trim().length() == 0) { if (password == null || password.trim().length() == 0) {
throw new AppException("密码不能为空！"); throw new AppException("密码不能为空！");
} }
if (securityCode == null || securityCode.trim().length() == 0) {
throw new AppException("验证码不能为空！");
}
return true; return true;
} }
} }
portal-manager/src/main/java/com/mortals/xhx/module/menu/service/impl/MenuServiceImpl.java
View file @ 6cb61c56
...@@ -38,8 +38,8 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity ...@@ -38,8 +38,8 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity
@Override @Override
public List<MenuEntity> findTreeMenu(IUser user, Set<String> urls) throws AppException { public List<MenuEntity> findTreeMenu(IUser user, Set<String> urls) throws AppException {
Set<Long> authIds = new HashSet<Long>(); Set<Long> authIds = new HashSet<>();
Map<Long, MenuEntity> menuMap = new HashMap<Long, MenuEntity>(); Map<Long, MenuEntity> menuMap = new HashMap<>();
List<MenuEntity> userModuleList = this.findAllEnable(); List<MenuEntity> userModuleList = this.findAllEnable();
for (MenuEntity sysModule : userModuleList) { for (MenuEntity sysModule : userModuleList) {
if (sysModule == null) { if (sysModule == null) {
......
portal-manager/src/main/java/com/mortals/xhx/module/model/dao/ModelDao.java 0 → 100644
View file @ 6cb61c56
package com.mortals.xhx.module.model.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.model.model.ModelEntity;
import java.util.List;
/**
* 系统模块Dao
* 系统模块 DAO接口
*
* @author zxfei
* @date 2022-06-01
*/
public interface ModelDao extends ICRUDDao<ModelEntity,Long>{
}
portal-manager/src/main/java/com/mortals/xhx/module/model/dao/ibatis/ModelDaoImpl.java 0 → 100644
View file @ 6cb61c56
package com.mortals.xhx.module.model.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.model.dao.ModelDao;
import com.mortals.xhx.module.model.model.ModelEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 系统模块DaoImpl DAO接口
*
* @author zxfei
* @date 2022-06-01
*/
@Repository("modelDao")
public class ModelDaoImpl extends BaseCRUDDaoMybatis<ModelEntity,Long> implements ModelDao {
}
portal-manager/src/main/java/com/mortals/xhx/module/model/model/ModelEntity.java 0 → 100644
View file @ 6cb61c56
package com.mortals.xhx.module.model.model;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.model.model.vo.ModelVo;
/**
* 系统模块实体对象
*
* @author zxfei
* @date 2022-06-01
*/
public class ModelEntity extends ModelVo {
private static final long serialVersionUID = 1L;
/**
* 系统模块名称
*/
private String modelName;
/**
* 模块编码
*/
private String modelCode;
/**
* 模块图标
*/
private String modelIcon;
/**
* 地址
*/
private String modelUrl;
/**
* 备注信息
*/
private String remark;
/**
* 排序
*/
private Integer sort;
public ModelEntity(){}
/**
* 获取 系统模块名称
* @return String
*/
public String getModelName(){
return modelName;
}
/**
* 设置 系统模块名称
* @param modelName
*/
public void setModelName(String modelName){
this.modelName = modelName;
}
/**
* 获取 模块编码
* @return String
*/
public String getModelCode(){
return modelCode;
}
/**
* 设置 模块编码
* @param modelCode
*/
public void setModelCode(String modelCode){
this.modelCode = modelCode;
}
/**
* 获取 模块图标
* @return String
*/
public String getModelIcon(){
return modelIcon;
}
/**
* 设置 模块图标
* @param modelIcon
*/
public void setModelIcon(String modelIcon){
this.modelIcon = modelIcon;
}
/**
* 获取 地址
* @return String
*/
public String getModelUrl(){
return modelUrl;
}
/**
* 设置 地址
* @param modelUrl
*/
public void setModelUrl(String modelUrl){
this.modelUrl = modelUrl;
}
/**
* 获取 备注信息
* @return String
*/
public String getRemark(){
return remark;
}
/**
* 设置 备注信息
* @param remark
*/
public void setRemark(String remark){
this.remark = remark;
}
/**
* 获取 排序
* @return Integer
*/
public Integer getSort(){
return sort;
}
/**
* 设置 排序
* @param sort
*/
public void setSort(Integer sort){
this.sort = sort;
}
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof ModelEntity) {
ModelEntity tmp = (ModelEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",modelName:").append(getModelName());
sb.append(",modelCode:").append(getModelCode());
sb.append(",modelIcon:").append(getModelIcon());
sb.append(",modelUrl:").append(getModelUrl());
sb.append(",remark:").append(getRemark());
sb.append(",sort:").append(getSort());
return sb.toString();
}
public void initAttrValue(){
this.modelName = "";
this.modelCode = "";
this.modelIcon = "";
this.modelUrl = "";
this.remark = "";
this.sort = 1;
}
}
\ No newline at end of file
portal-manager/src/main/java/com/mortals/xhx/module/model/model/ModelQuery.java 0 → 100644
View file @ 6cb61c56
package com.mortals.xhx.module.model.model;
import java.util.List;
import com.mortals.xhx.module.model.model.ModelEntity;
/**
* 系统模块查询对象
*
* @author zxfei
* @date 2022-06-01
*/
public class ModelQuery extends ModelEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
/** 结束 序号，主键，自增长 */
private Long idEnd;
/** 增加 序号，主键，自增长 */
private Long idIncrement;
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 系统模块名称 */
private List<String> modelNameList;
/** 模块编码 */
private List<String> modelCodeList;
/** 模块图标 */
private List<String> modelIconList;
/** 地址 */
private List<String> modelUrlList;
/** 备注信息 */
private List<String> remarkList;
/** 开始 排序 */
private Integer sortStart;
/** 结束 排序 */
private Integer sortEnd;
/** 增加 排序 */
private Integer sortIncrement;
/** 排序列表 */
private List <Integer> sortList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 开始 创建用户 */
private Long createUserIdStart;
/** 结束 创建用户 */
private Long createUserIdEnd;
/** 增加 创建用户 */
private Long createUserIdIncrement;
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 开始 修改时间 */
private String updateTimeStart;
/** 结束 修改时间 */
private String updateTimeEnd;
/** 开始 修改用户 */
private Long updateUserIdStart;
/** 结束 修改用户 */
private Long updateUserIdEnd;
/** 增加 修改用户 */
private Long updateUserIdIncrement;
/** 修改用户列表 */
private List <Long> updateUserIdList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<ModelQuery> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<ModelQuery> andConditionList;
public ModelQuery(){}
/**
* 获取 开始 序号，主键，自增长
* @return idStart
*/
public Long getIdStart(){
return this.idStart;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 序号，主键，自增长
* @return $idEnd
*/
public Long getIdEnd(){
return this.idEnd;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 序号，主键，自增长
* @return idIncrement
*/
public Long getIdIncrement(){
return this.idIncrement;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 序号，主键，自增长
* @return idList
*/
public List<Long> getIdList(){
return this.idList;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 系统模块名称
* @return modelNameList
*/
public List<String> getModelNameList(){
return this.modelNameList;
}
/**
* 设置 系统模块名称
* @param modelNameList
*/
public void setModelNameList(List<String> modelNameList){
this.modelNameList = modelNameList;
}
/**
* 获取 模块编码
* @return modelCodeList
*/
public List<String> getModelCodeList(){
return this.modelCodeList;
}
/**
* 设置 模块编码
* @param modelCodeList
*/
public void setModelCodeList(List<String> modelCodeList){
this.modelCodeList = modelCodeList;
}
/**
* 获取 模块图标
* @return modelIconList
*/
public List<String> getModelIconList(){
return this.modelIconList;
}
/**
* 设置 模块图标
* @param modelIconList
*/
public void setModelIconList(List<String> modelIconList){
this.modelIconList = modelIconList;
}
/**
* 获取 地址
* @return modelUrlList
*/
public List<String> getModelUrlList(){
return this.modelUrlList;
}
/**
* 设置 地址
* @param modelUrlList
*/
public void setModelUrlList(List<String> modelUrlList){
this.modelUrlList = modelUrlList;
}
/**
* 获取 备注信息
* @return remarkList
*/
public List<String> getRemarkList(){
return this.remarkList;
}
/**
* 设置 备注信息
* @param remarkList
*/
public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList;
}
/**
* 获取 开始 排序
* @return sortStart
*/
public Integer getSortStart(){
return this.sortStart;
}
/**
* 设置 开始 排序
* @param sortStart
*/
public void setSortStart(Integer sortStart){
this.sortStart = sortStart;
}
/**
* 获取 结束 排序
* @return $sortEnd
*/
public Integer getSortEnd(){
return this.sortEnd;
}
/**
* 设置 结束 排序
* @param sortEnd
*/
public void setSortEnd(Integer sortEnd){
this.sortEnd = sortEnd;
}
/**
* 获取 增加 排序
* @return sortIncrement
*/
public Integer getSortIncrement(){
return this.sortIncrement;
}
/**
* 设置 增加 排序
* @param sortIncrement
*/
public void setSortIncrement(Integer sortIncrement){
this.sortIncrement = sortIncrement;
}
/**
* 获取 排序
* @return sortList
*/
public List<Integer> getSortList(){
return this.sortList;
}
/**
* 设置 排序
* @param sortList
*/
public void setSortList(List<Integer> sortList){
this.sortList = sortList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
*/
public Long getCreateUserIdStart(){
return this.createUserIdStart;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
}
/**
* 获取 结束 创建用户
* @return $createUserIdEnd
*/
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
}
/**
* 获取 增加 创建用户
* @return createUserIdIncrement
*/
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
}
/**
* 获取 创建用户
* @return createUserIdList
*/
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
}
/**
* 获取 开始 修改时间
* @return updateTimeStart
*/
public String getUpdateTimeStart(){
return this.updateTimeStart;
}
/**
* 设置 开始 修改时间
* @param updateTimeStart
*/
public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
}
/**
* 获取 结束 修改时间
* @return updateTimeEnd
*/
public String getUpdateTimeEnd(){
return this.updateTimeEnd;
}
/**
* 设置 结束 修改时间
* @param updateTimeEnd
*/
public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 开始 修改用户
* @return updateUserIdStart
*/
public Long getUpdateUserIdStart(){
return this.updateUserIdStart;
}
/**
* 设置 开始 修改用户
* @param updateUserIdStart
*/
public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
}
/**
* 获取 结束 修改用户
* @return $updateUserIdEnd
*/
public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd;
}
/**
* 设置 结束 修改用户
* @param updateUserIdEnd
*/
public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
}
/**
* 获取 增加 修改用户
* @return updateUserIdIncrement
*/
public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement;
}
/**
* 设置 增加 修改用户
* @param updateUserIdIncrement
*/
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
}
/**
* 获取 修改用户
* @return updateUserIdList
*/
public List<Long> getUpdateUserIdList(){
return this.updateUserIdList;
}
/**
* 设置 修改用户
* @param updateUserIdList
*/
public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
}
/**
* 设置 序号，主键，自增长
* @param id
*/
public ModelQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public ModelQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public ModelQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public ModelQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public ModelQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 系统模块名称
* @param modelName
*/
public ModelQuery modelName(String modelName){
setModelName(modelName);
return this;
}
/**
* 设置 系统模块名称
* @param modelNameList
*/
public ModelQuery modelNameList(List<String> modelNameList){
this.modelNameList = modelNameList;
return this;
}
/**
* 设置 模块编码
* @param modelCode
*/
public ModelQuery modelCode(String modelCode){
setModelCode(modelCode);
return this;
}
/**
* 设置 模块编码
* @param modelCodeList
*/
public ModelQuery modelCodeList(List<String> modelCodeList){
this.modelCodeList = modelCodeList;
return this;
}
/**
* 设置 模块图标
* @param modelIcon
*/
public ModelQuery modelIcon(String modelIcon){
setModelIcon(modelIcon);
return this;
}
/**
* 设置 模块图标
* @param modelIconList
*/
public ModelQuery modelIconList(List<String> modelIconList){
this.modelIconList = modelIconList;
return this;
}
/**
* 设置 地址
* @param modelUrl
*/
public ModelQuery modelUrl(String modelUrl){
setModelUrl(modelUrl);
return this;
}
/**
* 设置 地址
* @param modelUrlList
*/
public ModelQuery modelUrlList(List<String> modelUrlList){
this.modelUrlList = modelUrlList;
return this;
}
/**
* 设置 备注信息
* @param remark
*/
public ModelQuery remark(String remark){
setRemark(remark);
return this;
}
/**
* 设置 备注信息
* @param remarkList
*/
public ModelQuery remarkList(List<String> remarkList){
this.remarkList = remarkList;
return this;
}
/**
* 设置 排序
* @param sort
*/
public ModelQuery sort(Integer sort){
setSort(sort);
return this;
}
/**
* 设置 开始 排序
* @param sortStart
*/
public ModelQuery sortStart(Integer sortStart){
this.sortStart = sortStart;
return this;
}
/**
* 设置 结束 排序
* @param sortEnd
*/
public ModelQuery sortEnd(Integer sortEnd){
this.sortEnd = sortEnd;
return this;
}
/**
* 设置 增加 排序
* @param sortIncrement
*/
public ModelQuery sortIncrement(Integer sortIncrement){
this.sortIncrement = sortIncrement;
return this;
}
/**
* 设置 排序
* @param sortList
*/
public ModelQuery sortList(List<Integer> sortList){
this.sortList = sortList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
public ModelQuery createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public ModelQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public ModelQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public ModelQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public ModelQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 修改用户
* @param updateUserId
*/
public ModelQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId);
return this;
}
/**
* 设置 开始 修改用户
* @param updateUserIdStart
*/
public ModelQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
return this;
}
/**
* 设置 结束 修改用户
* @param updateUserIdEnd
*/
public ModelQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
return this;
}
/**
* 设置 增加 修改用户
* @param updateUserIdIncrement
*/
public ModelQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
return this;
}
/**
* 设置 修改用户
* @param updateUserIdList
*/
public ModelQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
public List<ModelQuery> getOrConditionList(){
return this.orConditionList;
}
/**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
public void setOrConditionList(List<ModelQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
public List<ModelQuery> getAndConditionList(){
return this.andConditionList;
}
/**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
public void setAndConditionList(List<ModelQuery> andConditionList){
this.andConditionList = andConditionList;
}
}
\ No newline at end of file
portal-manager/src/main/java/com/mortals/xhx/module/model/model/vo/ModelVo.java 0 → 100644
View file @ 6cb61c56
package com.mortals.xhx.module.model.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.model.model.ModelEntity;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* 系统模块视图对象
*
* @author zxfei
* @date 2022-06-01
*/
@Data
public class ModelVo extends BaseEntityLong {
}
\ No newline at end of file
portal-manager/src/main/java/com/mortals/xhx/module/model/service/ModelService.java 0 → 100644
View file @ 6cb61c56
package com.mortals.xhx.module.model.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.model.model.ModelEntity;
/**
* ModelService
*
* 系统模块 service接口
*
* @author zxfei
* @date 2022-06-01
*/
public interface ModelService extends ICRUDService<ModelEntity,Long>{
}
\ No newline at end of file
portal-manager/src/main/java/com/mortals/xhx/module/model/service/impl/ModelServiceImpl.java 0 → 100644
View file @ 6cb61c56
package com.mortals.xhx.module.model.service.impl;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.module.model.dao.ModelDao;
import com.mortals.xhx.module.model.model.ModelEntity;
import com.mortals.xhx.module.model.service.ModelService;
/**
* ModelService
* 系统模块 service实现
*
* @author zxfei
* @date 2022-06-01
*/
@Service("modelService")
public class ModelServiceImpl extends AbstractCRUDServiceImpl<ModelDao, ModelEntity, Long> implements ModelService {
}
\ No newline at end of file
portal-manager/src/main/java/com/mortals/xhx/module/model/web/ModelController.java 0 → 100644
View file @ 6cb61c56
package com.mortals.xhx.module.model.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.model.model.ModelEntity;
import com.mortals.xhx.module.model.model.ModelQuery;
import com.mortals.xhx.module.model.service.ModelService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/**
*
* 系统模块
*
* @author zxfei
* @date 2022-06-01
*/
@RestController
@RequestMapping("model")
public class ModelController extends BaseCRUDJsonBodyMappingController<ModelService,ModelEntity,Long> {
@Autowired
private ParamService paramService;
public ModelController(){
super.setFormClass(ModelForm.class);
super.setModuleDesc( "系统模块");
}
@Override
protected void init(Map<String, Object> model, Context context) {
super.init(model, context);
}
}
\ No newline at end of file
portal-manager/src/main/java/com/mortals/xhx/module/user/model/UserEntity.java
View file @ 6cb61c56
...@@ -3,6 +3,8 @@ package com.mortals.xhx.module.user.model; ...@@ -3,6 +3,8 @@ package com.mortals.xhx.module.user.model;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
...@@ -12,7 +14,7 @@ import com.mortals.xhx.module.user.model.vo.UserVo; ...@@ -12,7 +14,7 @@ import com.mortals.xhx.module.user.model.vo.UserVo;
* 用户信息业务实体对象 * 用户信息业务实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-05-26 * @date 2022-06-01
*/ */
public class UserEntity extends UserVo implements IUser { public class UserEntity extends UserVo implements IUser {
...@@ -25,10 +27,12 @@ public class UserEntity extends UserVo implements IUser { ...@@ -25,10 +27,12 @@ public class UserEntity extends UserVo implements IUser {
/** /**
* 登录密码，使用md5双次加密 * 登录密码，使用md5双次加密
*/ */
@JSONField(serialize=false)
private String loginPwd; private String loginPwd;
/** /**
* 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录 * 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录
*/ */
@JSONField(serialize=false)
private String loginLimitAddress; private String loginLimitAddress;
/** /**
* 用户名 * 用户名
...@@ -51,7 +55,7 @@ public class UserEntity extends UserVo implements IUser { ...@@ -51,7 +55,7 @@ public class UserEntity extends UserVo implements IUser {
*/ */
private String qq; private String qq;
/** /**
* 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 * 用户类型(0.系统用户,1.普通用户,2.工作人员)
*/ */
private Integer userType; private Integer userType;
/** /**
...@@ -59,24 +63,37 @@ public class UserEntity extends UserVo implements IUser { ...@@ -59,24 +63,37 @@ public class UserEntity extends UserVo implements IUser {
*/ */
private String siteIds; private String siteIds;
/** /**
* 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 * 所属区域code,多个逗号分隔
*/
private String areaCodes;
/**
* 拥有系统模块,多个逗号分隔
*/ */
private String modeIds;
/**
* 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
*/
@JSONField(serialize=false)
private Integer status; private Integer status;
/** /**
* 客户ID * 客户ID
*/ */
@JSONField(serialize=false)
private Long customerId; private Long customerId;
/** /**
* 创建用户名称 * 创建用户名称
*/ */
@JSONField(serialize=false)
private String createUserName; private String createUserName;
/** /**
* 最后一次登录时间 * 最后一次登录时间
*/ */
@JSONField(serialize=false)
private Date lastLoginTime; private Date lastLoginTime;
/** /**
* 最后一次登录地址 * 最后一次登录地址
*/ */
@JSONField(serialize=false)
private String lastLoginAddress; private String lastLoginAddress;
...@@ -211,14 +228,14 @@ public class UserEntity extends UserVo implements IUser { ...@@ -211,14 +228,14 @@ public class UserEntity extends UserVo implements IUser {
this.qq = qq; this.qq = qq;
} }
/** /**
* 获取 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 * 获取 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @return Integer * @return Integer
*/ */
public Integer getUserType(){ public Integer getUserType(){
return userType; return userType;
} }
/** /**
* 设置 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 * 设置 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userType * @param userType
*/ */
public void setUserType(Integer userType){ public void setUserType(Integer userType){
...@@ -250,14 +267,42 @@ public class UserEntity extends UserVo implements IUser { ...@@ -250,14 +267,42 @@ public class UserEntity extends UserVo implements IUser {
this.siteIds = siteIds; this.siteIds = siteIds;
} }
/** /**
* 获取 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 * 获取 所属区域code,多个逗号分隔
* @return String
*/
public String getAreaCodes(){
return areaCodes;
}
/**
* 设置 所属区域code,多个逗号分隔
* @param areaCodes
*/
public void setAreaCodes(String areaCodes){
this.areaCodes = areaCodes;
}
/**
* 获取 拥有系统模块,多个逗号分隔
* @return String
*/
public String getModeIds(){
return modeIds;
}
/**
* 设置 拥有系统模块,多个逗号分隔
* @param modeIds
*/
public void setModeIds(String modeIds){
this.modeIds = modeIds;
}
/**
* 获取 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @return Integer * @return Integer
*/ */
public Integer getStatus(){ public Integer getStatus(){
return status; return status;
} }
/** /**
* 设置 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 * 设置 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param status * @param status
*/ */
public void setStatus(Integer status){ public void setStatus(Integer status){
...@@ -337,9 +382,6 @@ public class UserEntity extends UserVo implements IUser { ...@@ -337,9 +382,6 @@ public class UserEntity extends UserVo implements IUser {
this.lastLoginAddress = lastLoginAddress; this.lastLoginAddress = lastLoginAddress;
} }
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -368,6 +410,8 @@ public class UserEntity extends UserVo implements IUser { ...@@ -368,6 +410,8 @@ public class UserEntity extends UserVo implements IUser {
sb.append(",qq:").append(getQq()); sb.append(",qq:").append(getQq());
sb.append(",userType:").append(getUserType()); sb.append(",userType:").append(getUserType());
sb.append(",siteIds:").append(getSiteIds()); sb.append(",siteIds:").append(getSiteIds());
sb.append(",areaCodes:").append(getAreaCodes());
sb.append(",modeIds:").append(getModeIds());
sb.append(",status:").append(getStatus()); sb.append(",status:").append(getStatus());
sb.append(",customerId:").append(getCustomerId()); sb.append(",customerId:").append(getCustomerId());
sb.append(",createUserName:").append(getCreateUserName()); sb.append(",createUserName:").append(getCreateUserName());
...@@ -398,6 +442,10 @@ public class UserEntity extends UserVo implements IUser { ...@@ -398,6 +442,10 @@ public class UserEntity extends UserVo implements IUser {
this.siteIds = ""; this.siteIds = "";
this.areaCodes = "";
this.modeIds = "";
this.status = 1; this.status = 1;
this.customerId = null; this.customerId = null;
......
portal-manager/src/main/java/com/mortals/xhx/module/user/model/UserQuery.java
View file @ 6cb61c56
...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.user.model.UserEntity; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.user.model.UserEntity;
* 用户信息业务查询对象 * 用户信息业务查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-05-26 * @date 2022-06-01
*/ */
public class UserQuery extends UserEntity { public class UserQuery extends UserEntity {
/** 开始 用户ID，主键，自增长 */ /** 开始 用户ID，主键，自增长 */
...@@ -46,31 +46,37 @@ public class UserQuery extends UserEntity { ...@@ -46,31 +46,37 @@ public class UserQuery extends UserEntity {
/** QQ号码 */ /** QQ号码 */
private List<String> qqList; private List<String> qqList;
/** 开始 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 */ /** 开始 用户类型(0.系统用户,1.普通用户,2.工作人员) */
private Integer userTypeStart; private Integer userTypeStart;
/** 结束 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 */ /** 结束 用户类型(0.系统用户,1.普通用户,2.工作人员) */
private Integer userTypeEnd; private Integer userTypeEnd;
/** 增加 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 */ /** 增加 用户类型(0.系统用户,1.普通用户,2.工作人员) */
private Integer userTypeIncrement; private Integer userTypeIncrement;
/** 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2列表 */ /** 用户类型(0.系统用户,1.普通用户,2.工作人员)列表 */
private List <Integer> userTypeList; private List <Integer> userTypeList;
/** 所属站点id,多个逗号分隔 */ /** 所属站点id,多个逗号分隔 */
private List<String> siteIdsList; private List<String> siteIdsList;
/** 开始 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 */ /** 所属区域code,多个逗号分隔 */
private List<String> areaCodesList;
/** 拥有系统模块,多个逗号分隔 */
private List<String> modeIdsList;
/** 开始 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) */
private Integer statusStart; private Integer statusStart;
/** 结束 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 */ /** 结束 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) */
private Integer statusEnd; private Integer statusEnd;
/** 增加 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 */ /** 增加 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) */
private Integer statusIncrement; private Integer statusIncrement;
/** 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1列表 */ /** 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)列表 */
private List <Integer> statusList; private List <Integer> statusList;
/** 开始 客户ID */ /** 开始 客户ID */
...@@ -308,7 +314,7 @@ public class UserQuery extends UserEntity { ...@@ -308,7 +314,7 @@ public class UserQuery extends UserEntity {
this.qqList = qqList; this.qqList = qqList;
} }
/** /**
* 获取 开始 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 * 获取 开始 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @return userTypeStart * @return userTypeStart
*/ */
public Integer getUserTypeStart(){ public Integer getUserTypeStart(){
...@@ -316,7 +322,7 @@ public class UserQuery extends UserEntity { ...@@ -316,7 +322,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 开始 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 * 设置 开始 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userTypeStart * @param userTypeStart
*/ */
public void setUserTypeStart(Integer userTypeStart){ public void setUserTypeStart(Integer userTypeStart){
...@@ -324,7 +330,7 @@ public class UserQuery extends UserEntity { ...@@ -324,7 +330,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 获取 结束 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 * 获取 结束 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @return $userTypeEnd * @return $userTypeEnd
*/ */
public Integer getUserTypeEnd(){ public Integer getUserTypeEnd(){
...@@ -332,7 +338,7 @@ public class UserQuery extends UserEntity { ...@@ -332,7 +338,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 结束 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 * 设置 结束 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userTypeEnd * @param userTypeEnd
*/ */
public void setUserTypeEnd(Integer userTypeEnd){ public void setUserTypeEnd(Integer userTypeEnd){
...@@ -340,7 +346,7 @@ public class UserQuery extends UserEntity { ...@@ -340,7 +346,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 获取 增加 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 * 获取 增加 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @return userTypeIncrement * @return userTypeIncrement
*/ */
public Integer getUserTypeIncrement(){ public Integer getUserTypeIncrement(){
...@@ -348,7 +354,7 @@ public class UserQuery extends UserEntity { ...@@ -348,7 +354,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 增加 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 * 设置 增加 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userTypeIncrement * @param userTypeIncrement
*/ */
public void setUserTypeIncrement(Integer userTypeIncrement){ public void setUserTypeIncrement(Integer userTypeIncrement){
...@@ -356,7 +362,7 @@ public class UserQuery extends UserEntity { ...@@ -356,7 +362,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 获取 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 * 获取 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @return userTypeList * @return userTypeList
*/ */
public List<Integer> getUserTypeList(){ public List<Integer> getUserTypeList(){
...@@ -364,7 +370,7 @@ public class UserQuery extends UserEntity { ...@@ -364,7 +370,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 * 设置 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userTypeList * @param userTypeList
*/ */
public void setUserTypeList(List<Integer> userTypeList){ public void setUserTypeList(List<Integer> userTypeList){
...@@ -387,7 +393,37 @@ public class UserQuery extends UserEntity { ...@@ -387,7 +393,37 @@ public class UserQuery extends UserEntity {
this.siteIdsList = siteIdsList; this.siteIdsList = siteIdsList;
} }
/** /**
* 获取 开始 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 * 获取 所属区域code,多个逗号分隔
* @return areaCodesList
*/
public List<String> getAreaCodesList(){
return this.areaCodesList;
}
/**
* 设置 所属区域code,多个逗号分隔
* @param areaCodesList
*/
public void setAreaCodesList(List<String> areaCodesList){
this.areaCodesList = areaCodesList;
}
/**
* 获取 拥有系统模块,多个逗号分隔
* @return modeIdsList
*/
public List<String> getModeIdsList(){
return this.modeIdsList;
}
/**
* 设置 拥有系统模块,多个逗号分隔
* @param modeIdsList
*/
public void setModeIdsList(List<String> modeIdsList){
this.modeIdsList = modeIdsList;
}
/**
* 获取 开始 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @return statusStart * @return statusStart
*/ */
public Integer getStatusStart(){ public Integer getStatusStart(){
...@@ -395,7 +431,7 @@ public class UserQuery extends UserEntity { ...@@ -395,7 +431,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 开始 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 * 设置 开始 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusStart * @param statusStart
*/ */
public void setStatusStart(Integer statusStart){ public void setStatusStart(Integer statusStart){
...@@ -403,7 +439,7 @@ public class UserQuery extends UserEntity { ...@@ -403,7 +439,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 获取 结束 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 * 获取 结束 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @return $statusEnd * @return $statusEnd
*/ */
public Integer getStatusEnd(){ public Integer getStatusEnd(){
...@@ -411,7 +447,7 @@ public class UserQuery extends UserEntity { ...@@ -411,7 +447,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 结束 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 * 设置 结束 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusEnd * @param statusEnd
*/ */
public void setStatusEnd(Integer statusEnd){ public void setStatusEnd(Integer statusEnd){
...@@ -419,7 +455,7 @@ public class UserQuery extends UserEntity { ...@@ -419,7 +455,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 获取 增加 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 * 获取 增加 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @return statusIncrement * @return statusIncrement
*/ */
public Integer getStatusIncrement(){ public Integer getStatusIncrement(){
...@@ -427,7 +463,7 @@ public class UserQuery extends UserEntity { ...@@ -427,7 +463,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 增加 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 * 设置 增加 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusIncrement * @param statusIncrement
*/ */
public void setStatusIncrement(Integer statusIncrement){ public void setStatusIncrement(Integer statusIncrement){
...@@ -435,7 +471,7 @@ public class UserQuery extends UserEntity { ...@@ -435,7 +471,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 获取 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 * 获取 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @return statusList * @return statusList
*/ */
public List<Integer> getStatusList(){ public List<Integer> getStatusList(){
...@@ -443,7 +479,7 @@ public class UserQuery extends UserEntity { ...@@ -443,7 +479,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 * 设置 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusList * @param statusList
*/ */
public void setStatusList(List<Integer> statusList){ public void setStatusList(List<Integer> statusList){
...@@ -870,7 +906,7 @@ public class UserQuery extends UserEntity { ...@@ -870,7 +906,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 * 设置 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userType * @param userType
*/ */
public UserQuery userType(Integer userType){ public UserQuery userType(Integer userType){
...@@ -879,7 +915,7 @@ public class UserQuery extends UserEntity { ...@@ -879,7 +915,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 开始 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 * 设置 开始 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userTypeStart * @param userTypeStart
*/ */
public UserQuery userTypeStart(Integer userTypeStart){ public UserQuery userTypeStart(Integer userTypeStart){
...@@ -888,7 +924,7 @@ public class UserQuery extends UserEntity { ...@@ -888,7 +924,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 结束 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 * 设置 结束 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userTypeEnd * @param userTypeEnd
*/ */
public UserQuery userTypeEnd(Integer userTypeEnd){ public UserQuery userTypeEnd(Integer userTypeEnd){
...@@ -897,7 +933,7 @@ public class UserQuery extends UserEntity { ...@@ -897,7 +933,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 增加 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 * 设置 增加 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userTypeIncrement * @param userTypeIncrement
*/ */
public UserQuery userTypeIncrement(Integer userTypeIncrement){ public UserQuery userTypeIncrement(Integer userTypeIncrement){
...@@ -906,7 +942,7 @@ public class UserQuery extends UserEntity { ...@@ -906,7 +942,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 * 设置 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userTypeList * @param userTypeList
*/ */
public UserQuery userTypeList(List<Integer> userTypeList){ public UserQuery userTypeList(List<Integer> userTypeList){
...@@ -933,8 +969,46 @@ public class UserQuery extends UserEntity { ...@@ -933,8 +969,46 @@ public class UserQuery extends UserEntity {
return this; return this;
} }
/**
* 设置 所属区域code,多个逗号分隔
* @param areaCodes
*/
public UserQuery areaCodes(String areaCodes){
setAreaCodes(areaCodes);
return this;
}
/**
* 设置 所属区域code,多个逗号分隔
* @param areaCodesList
*/
public UserQuery areaCodesList(List<String> areaCodesList){
this.areaCodesList = areaCodesList;
return this;
}
/**
* 设置 拥有系统模块,多个逗号分隔
* @param modeIds
*/
public UserQuery modeIds(String modeIds){
setModeIds(modeIds);
return this;
}
/**
* 设置 拥有系统模块,多个逗号分隔
* @param modeIdsList
*/
public UserQuery modeIdsList(List<String> modeIdsList){
this.modeIdsList = modeIdsList;
return this;
}
/** /**
* 设置 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 * 设置 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param status * @param status
*/ */
public UserQuery status(Integer status){ public UserQuery status(Integer status){
...@@ -943,7 +1017,7 @@ public class UserQuery extends UserEntity { ...@@ -943,7 +1017,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 开始 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 * 设置 开始 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusStart * @param statusStart
*/ */
public UserQuery statusStart(Integer statusStart){ public UserQuery statusStart(Integer statusStart){
...@@ -952,7 +1026,7 @@ public class UserQuery extends UserEntity { ...@@ -952,7 +1026,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 结束 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 * 设置 结束 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusEnd * @param statusEnd
*/ */
public UserQuery statusEnd(Integer statusEnd){ public UserQuery statusEnd(Integer statusEnd){
...@@ -961,7 +1035,7 @@ public class UserQuery extends UserEntity { ...@@ -961,7 +1035,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 增加 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 * 设置 增加 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusIncrement * @param statusIncrement
*/ */
public UserQuery statusIncrement(Integer statusIncrement){ public UserQuery statusIncrement(Integer statusIncrement){
...@@ -970,7 +1044,7 @@ public class UserQuery extends UserEntity { ...@@ -970,7 +1044,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 * 设置 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusList * @param statusList
*/ */
public UserQuery statusList(List<Integer> statusList){ public UserQuery statusList(List<Integer> statusList){
......
portal-manager/src/main/java/com/mortals/xhx/module/user/model/vo/UserVo.java
View file @ 6cb61c56
package com.mortals.xhx.module.user.model.vo; package com.mortals.xhx.module.user.model.vo;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.framework.service.IUser; import com.mortals.framework.service.IUser;
import com.mortals.xhx.module.menu.model.MenuEntity;
import com.mortals.xhx.module.model.model.ModelEntity;
import com.mortals.xhx.module.user.model.UserEntity; import com.mortals.xhx.module.user.model.UserEntity;
import lombok.Data; import lombok.Data;
...@@ -17,7 +19,7 @@ public class UserVo extends BaseEntityLong { ...@@ -17,7 +19,7 @@ public class UserVo extends BaseEntityLong {
/** /**
* 站点名称 * 站点名称
*/ */
private String siteName; //private String siteName;
/** /**
* 唯一标识 * 唯一标识
*/ */
...@@ -36,4 +38,14 @@ public class UserVo extends BaseEntityLong { ...@@ -36,4 +38,14 @@ public class UserVo extends BaseEntityLong {
* 过期时间 * 过期时间
*/ */
private Long expireTime; private Long expireTime;
/**
* 模块列表
*/
private List<ModelEntity> modelList;
/**
* 菜单列表
*/
private List<MenuEntity> menuList;
} }
\ No newline at end of file
portal-manager/src/main/java/com/mortals/xhx/module/user/service/UserService.java
View file @ 6cb61c56
...@@ -4,6 +4,7 @@ import com.mortals.framework.model.Result; ...@@ -4,6 +4,7 @@ import com.mortals.framework.model.Result;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.framework.service.IUser; import com.mortals.framework.service.IUser;
import com.mortals.xhx.module.menu.model.MenuEntity; import com.mortals.xhx.module.menu.model.MenuEntity;
import com.mortals.xhx.module.model.model.ModelEntity;
import com.mortals.xhx.module.user.model.UserEntity; import com.mortals.xhx.module.user.model.UserEntity;
import java.util.List; import java.util.List;
...@@ -56,6 +57,7 @@ public interface UserService extends ICRUDService<UserEntity,Long>{ ...@@ -56,6 +57,7 @@ public interface UserService extends ICRUDService<UserEntity,Long>{
*/ */
List<MenuEntity> findOutlookBarList(IUser user); List<MenuEntity> findOutlookBarList(IUser user);
/** /**
* 查询用户所有有权限的菜单ID * 查询用户所有有权限的菜单ID
* *
...@@ -76,21 +78,6 @@ public interface UserService extends ICRUDService<UserEntity,Long>{ ...@@ -76,21 +78,6 @@ public interface UserService extends ICRUDService<UserEntity,Long>{
*/ */
Result<UserEntity> find(Long platformId, UserEntity params, int currPage, int prePageResult) throws AppException; Result<UserEntity> find(Long platformId, UserEntity params, int currPage, int prePageResult) throws AppException;
/**
* 为客户创建用户
*
* @param currUser 当前用户
* @param customerId 客户ID
* @param customerName 客户名称
* @param loginName
* @param password
* @param userName
* @param mobile
* @return
* @throws AppException
*/
UserEntity createUser(IUser currUser, Long customerId, String customerName, String loginName, String password,
String userName, String mobile) throws AppException;
/** /**
* 用户修改密码 * 用户修改密码
...@@ -104,4 +91,13 @@ public interface UserService extends ICRUDService<UserEntity,Long>{ ...@@ -104,4 +91,13 @@ public interface UserService extends ICRUDService<UserEntity,Long>{
boolean updateUserPwd(String loginName, String oldPwd, String newPwd) throws AppException; boolean updateUserPwd(String loginName, String oldPwd, String newPwd) throws AppException;
/**
* 通过登录用户获取模块
*
* @param userId
* @return
*/
List<ModelEntity> findModelList(Long userId);
} }
\ No newline at end of file
portal-manager/src/main/java/com/mortals/xhx/module/user/service/impl/UserServiceImpl.java
View file @ 6cb61c56
package com.mortals.xhx.module.user.service.impl; package com.mortals.xhx.module.user.service.impl;
import com.mortals.framework.ap.SysConstains; import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.common.code.UserType; import com.mortals.framework.common.code.UserType;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
...@@ -10,6 +11,9 @@ import com.mortals.framework.util.SecurityUtil; ...@@ -10,6 +11,9 @@ import com.mortals.framework.util.SecurityUtil;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.module.menu.model.MenuEntity; import com.mortals.xhx.module.menu.model.MenuEntity;
import com.mortals.xhx.module.menu.service.MenuService; import com.mortals.xhx.module.menu.service.MenuService;
import com.mortals.xhx.module.model.model.ModelEntity;
import com.mortals.xhx.module.model.model.ModelQuery;
import com.mortals.xhx.module.model.service.ModelService;
import com.mortals.xhx.module.resource.model.ResourceEntity; import com.mortals.xhx.module.resource.model.ResourceEntity;
import com.mortals.xhx.module.resource.service.ResourceService; import com.mortals.xhx.module.resource.service.ResourceService;
import com.mortals.xhx.module.user.model.UserQuery; import com.mortals.xhx.module.user.model.UserQuery;
...@@ -25,18 +29,20 @@ import java.util.*; ...@@ -25,18 +29,20 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* UserService * UserService
* 用户信息业务 service实现 * 用户信息业务 service实现
* *
* @author zxfei * @author zxfei
* @date 2022-05-25 * @date 2022-05-25
*/ */
@Service("userService") @Service("userService")
public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity, Long> implements UserService { public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity, Long> implements UserService {
@Autowired @Autowired
private MenuService menuService; private MenuService menuService;
@Autowired @Autowired
private ResourceService resourceService; private ResourceService resourceService;
@Autowired
private ModelService modelService;
private void doHandlerUser(UserEntity entity) throws AppException { private void doHandlerUser(UserEntity entity) throws AppException {
if (StringUtils.isNotEmpty(entity.getLoginPwd())) { if (StringUtils.isNotEmpty(entity.getLoginPwd())) {
...@@ -195,33 +201,6 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity ...@@ -195,33 +201,6 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
return super.find(params, pageInfo, null); return super.find(params, pageInfo, null);
} }
@Override
public UserEntity createUser(IUser currUser, Long customerId, String customerName, String loginName, String password,
String userName, String mobile) throws AppException {
try {
UserEntity entity = new UserEntity();
entity.initAttrValue();
entity.setLoginName(loginName);
entity.setRealName(userName);
entity.setCustomerId(customerId);
entity.setLoginPwd(password);
entity.setMobile(mobile);
entity.setUserType(UserType.CUSTOMER.getValue());
entity.setCreateTime(new Date());
if (currUser != null) {
entity.setCreateUser(currUser.getLoginName());
entity.setCreateUserName(currUser.getRealName());
}
this.doHandlerUser(entity);
dao.insert(entity);
return entity;
} catch (Exception e) {
log.error("给客户创建用户异常-->customerId:" + customerId + ",customerName:" + customerName + ",loginName:" + loginName +
"-->原因：" + e.getMessage());
return null;
}
}
@Override @Override
public boolean existUser(String loginName, Long userId) throws AppException { public boolean existUser(String loginName, Long userId) throws AppException {
UserEntity sysUser = this.findByLoginName(loginName); UserEntity sysUser = this.findByLoginName(loginName);
...@@ -249,11 +228,6 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity ...@@ -249,11 +228,6 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
} }
try { try {
sysUser.setLoginPwd(SecurityUtil.md5DoubleEncoding(newPwd)); sysUser.setLoginPwd(SecurityUtil.md5DoubleEncoding(newPwd));
// sysUser.setLoginPwd3(sysUser.getLoginPwd2());
// sysUser.setLoginPwd2(sysUser.getLoginPwd1());
// sysUser.setLoginPwd1(sysUser.getLoginPwd());
// sysUser.setLastModPwdTime(new Date());
} catch (Exception e) { } catch (Exception e) {
throw new AppException("密码转换异常！", e); throw new AppException("密码转换异常！", e);
} }
...@@ -261,14 +235,19 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity ...@@ -261,14 +235,19 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
return true; return true;
} }
@Override @Override
protected void findAfter(UserEntity params, PageInfo pageInfo, Context context, List<UserEntity> list) throws AppException { public List<ModelEntity> findModelList(Long userId) {
super.findAfter(params, pageInfo, context, list); UserEntity userEntity = this.get(userId);
// list.stream().peek(item->{ if (!ObjectUtils.isEmpty(userEntity)) {
// if(!ObjectUtils.isEmpty(item.getSiteId())&&item.getSiteId()!=0L){ List<Long> modeIdList = Arrays.asList(userEntity.getModeIds().split(",")).stream().filter(f -> !ObjectUtils.isEmpty(f)).map(Long::parseLong).collect(Collectors.toList());
// item.setSiteName(siteService.get(item.getSiteId()).getSiteName()); if (!ObjectUtils.isEmpty(modeIdList)) {
// } ModelQuery modelQuery = new ModelQuery();
// }).count(); modelQuery.setIdList(modeIdList);
List<ModelEntity> modelEntities = modelService.find(modelQuery);
return modelEntities == null ? new ArrayList<>() : modelEntities;
}
}
return new ArrayList<>();
} }
} }
\ No newline at end of file
portal-manager/src/main/resources/sqlmap/module/model/ModelMapper.xml 0 → 100644
View file @ 6cb61c56
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.model.dao.ibatis.ModelDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="ModelEntity" id="ModelEntity-Map">
<id property="id" column="id" />
<result property="modelName" column="modelName" />
<result property="modelCode" column="modelCode" />
<result property="modelIcon" column="modelIcon" />
<result property="modelUrl" column="modelUrl" />
<result property="remark" column="remark" />
<result property="sort" column="sort" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" />
<result property="updateUserId" column="updateUserId" />
</resultMap>
<!-- 表所有列 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelName') or colPickMode == 1 and data.containsKey('modelName')))">
a.modelName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelCode') or colPickMode == 1 and data.containsKey('modelCode')))">
a.modelCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelIcon') or colPickMode == 1 and data.containsKey('modelIcon')))">
a.modelIcon,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelUrl') or colPickMode == 1 and data.containsKey('modelUrl')))">
a.modelUrl,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sort') or colPickMode == 1 and data.containsKey('sort')))">
a.sort,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="ModelEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_model
(modelName,modelCode,modelIcon,modelUrl,remark,sort,createTime,createUserId,updateTime,updateUserId)
VALUES
(#{modelName},#{modelCode},#{modelIcon},#{modelUrl},#{remark},#{sort},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_model
(modelName,modelCode,modelIcon,modelUrl,remark,sort,createTime,createUserId,updateTime,updateUserId)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.modelName},#{item.modelCode},#{item.modelIcon},#{item.modelUrl},#{item.remark},#{item.sort},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
</foreach>
</insert>
<!-- 根据ParamDto更新 -->
<update id="update" parameterType="paramDto">
update mortals_sys_model as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('modelName')) or (colPickMode==1 and !data.containsKey('modelName'))">
a.modelName=#{data.modelName},
</if>
<if test="(colPickMode==0 and data.containsKey('modelCode')) or (colPickMode==1 and !data.containsKey('modelCode'))">
a.modelCode=#{data.modelCode},
</if>
<if test="(colPickMode==0 and data.containsKey('modelIcon')) or (colPickMode==1 and !data.containsKey('modelIcon'))">
a.modelIcon=#{data.modelIcon},
</if>
<if test="(colPickMode==0 and data.containsKey('modelUrl')) or (colPickMode==1 and !data.containsKey('modelUrl'))">
a.modelUrl=#{data.modelUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark},
</if>
<if test="(colPickMode==0 and data.containsKey('sort')) or (colPickMode==1 and !data.containsKey('sort'))">
a.sort=#{data.sort},
</if>
<if test="(colPickMode==0 and data.containsKey('sortIncrement')) or (colPickMode==1 and !data.containsKey('sortIncrement'))">
a.sort=ifnull(a.sort,0) + #{data.sortIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
a.updateUserId=#{data.updateUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</update>
<!-- 批量更新 -->
<update id="updateBatch" parameterType="paramDto">
update mortals_sys_model as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="modelName=(case" suffix="ELSE modelName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('modelName')) or (colPickMode==1 and !item.containsKey('modelName'))">
when a.id=#{item.id} then #{item.modelName}
</if>
</foreach>
</trim>
<trim prefix="modelCode=(case" suffix="ELSE modelCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('modelCode')) or (colPickMode==1 and !item.containsKey('modelCode'))">
when a.id=#{item.id} then #{item.modelCode}
</if>
</foreach>
</trim>
<trim prefix="modelIcon=(case" suffix="ELSE modelIcon end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('modelIcon')) or (colPickMode==1 and !item.containsKey('modelIcon'))">
when a.id=#{item.id} then #{item.modelIcon}
</if>
</foreach>
</trim>
<trim prefix="modelUrl=(case" suffix="ELSE modelUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('modelUrl')) or (colPickMode==1 and !item.containsKey('modelUrl'))">
when a.id=#{item.id} then #{item.modelUrl}
</if>
</foreach>
</trim>
<trim prefix="remark=(case" suffix="ELSE remark end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
when a.id=#{item.id} then #{item.remark}
</if>
</foreach>
</trim>
<trim prefix="sort=(case" suffix="ELSE sort end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('sort')) or (colPickMode==1 and !item.containsKey('sort'))">
when a.id=#{item.id} then #{item.sort}
</when>
<when test="(colPickMode==0 and item.containsKey('sortIncrement')) or (colPickMode==1 and !item.containsKey('sortIncrement'))">
when a.id=#{item.id} then ifnull(a.sort,0) + #{item.sortIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime}
</if>
</foreach>
</trim>
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
when a.id=#{item.id} then #{item.updateUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</update>
<!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="ModelEntity-Map">
select <include refid="_columns"/>
from mortals_sys_model as a
where a.id=#{condition.id}
</select>
<!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_sys_model as a where a.id=#{condition.id}
</delete>
<!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys">
delete from mortals_sys_model where id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_sys_model as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</delete>
<!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="ModelEntity-Map">
select <include refid="_columns"/>
from mortals_sys_model as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
<include refid="_orderCols_"/>
</select>
<!-- 获取 -->
<select id="getListCount" parameterType="paramDto" resultType="int">
select count(1)
from mortals_sys_model as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</select>
<!-- 条件映射 -->
<sql id="_condition_">
<if test="condition != null and !condition.isEmpty()">
<!-- 条件映射-普通条件 -->
<include refid="_condition_param_">
<property name="_conditionParam_" value="condition"/>
<property name="_conditionType_" value="and"/>
</include>
<!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
<if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
and
<foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
<trim prefixOverrides="or" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="andCondition"/>
<property name="_conditionType_" value="or"/>
</include>
</trim>
</foreach>
</if>
<!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
<if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
and
<foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
<trim prefixOverrides="and" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="orCondition"/>
<property name="_conditionType_" value="and"/>
</include>
</trim>
</foreach>
</if>
</if>
</sql>
<!-- 条件映射-代参数 -->
<sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id}
</if>
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('modelName')">
<if test="conditionParamRef.modelName != null and conditionParamRef.modelName != ''">
${_conditionType_} a.modelName like #{${_conditionParam_}.modelName}
</if>
<if test="conditionParamRef.modelName == null">
${_conditionType_} a.modelName is null
</if>
</if>
<if test="conditionParamRef.containsKey('modelNameList')">
${_conditionType_} a.modelName in
<foreach collection="conditionParamRef.modelNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('modelCode')">
<if test="conditionParamRef.modelCode != null and conditionParamRef.modelCode != ''">
${_conditionType_} a.modelCode like #{${_conditionParam_}.modelCode}
</if>
<if test="conditionParamRef.modelCode == null">
${_conditionType_} a.modelCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('modelCodeList')">
${_conditionType_} a.modelCode in
<foreach collection="conditionParamRef.modelCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('modelIcon')">
<if test="conditionParamRef.modelIcon != null and conditionParamRef.modelIcon != ''">
${_conditionType_} a.modelIcon like #{${_conditionParam_}.modelIcon}
</if>
<if test="conditionParamRef.modelIcon == null">
${_conditionType_} a.modelIcon is null
</if>
</if>
<if test="conditionParamRef.containsKey('modelIconList')">
${_conditionType_} a.modelIcon in
<foreach collection="conditionParamRef.modelIconList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('modelUrl')">
<if test="conditionParamRef.modelUrl != null and conditionParamRef.modelUrl != ''">
${_conditionType_} a.modelUrl like #{${_conditionParam_}.modelUrl}
</if>
<if test="conditionParamRef.modelUrl == null">
${_conditionType_} a.modelUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('modelUrlList')">
${_conditionType_} a.modelUrl in
<foreach collection="conditionParamRef.modelUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</if>
<if test="conditionParamRef.remark == null">
${_conditionType_} a.remark is null
</if>
</if>
<if test="conditionParamRef.containsKey('remarkList')">
${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sort')">
<if test="conditionParamRef.sort != null ">
${_conditionType_} a.sort = #{${_conditionParam_}.sort}
</if>
<if test="conditionParamRef.sort == null">
${_conditionType_} a.sort is null
</if>
</if>
<if test="conditionParamRef.containsKey('sortList')">
${_conditionType_} a.sort in
<foreach collection="conditionParamRef.sortList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sortStart') and conditionParamRef.sortStart != null">
${_conditionType_} a.sort <![CDATA[ >= ]]> #{${_conditionParam_}.sortStart}
</if>
<if test="conditionParamRef.containsKey('sortEnd') and conditionParamRef.sortEnd != null">
${_conditionType_} a.sort <![CDATA[ <= ]]> #{${_conditionParam_}.sortEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList')">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
<if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList')">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('modelName')">
a.modelName
<if test='orderCol.modelName != null and "DESC".equalsIgnoreCase(orderCol.modelName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('modelCode')">
a.modelCode
<if test='orderCol.modelCode != null and "DESC".equalsIgnoreCase(orderCol.modelCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('modelIcon')">
a.modelIcon
<if test='orderCol.modelIcon != null and "DESC".equalsIgnoreCase(orderCol.modelIcon)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('modelUrl')">
a.modelUrl
<if test='orderCol.modelUrl != null and "DESC".equalsIgnoreCase(orderCol.modelUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('remark')">
a.remark
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('sort')">
a.sort
<if test='orderCol.sort != null and "DESC".equalsIgnoreCase(orderCol.sort)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateUserId')">
a.updateUserId
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
GROUP BY
<trim suffixOverrides="," suffix="">
<foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
${item}
</foreach>
</trim>
</if>
</sql>
</mapper>
\ No newline at end of file
portal-manager/src/main/resources/sqlmap/module/user/UserMapper.xml
View file @ 6cb61c56
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
<result property="qq" column="qq" /> <result property="qq" column="qq" />
<result property="userType" column="userType" /> <result property="userType" column="userType" />
<result property="siteIds" column="siteIds" /> <result property="siteIds" column="siteIds" />
<result property="areaCodes" column="areaCodes" />
<result property="modeIds" column="modeIds" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="customerId" column="customerId" /> <result property="customerId" column="customerId" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
...@@ -63,6 +65,12 @@ ...@@ -63,6 +65,12 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteIds') or colPickMode == 1 and data.containsKey('siteIds')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteIds') or colPickMode == 1 and data.containsKey('siteIds')))">
a.siteIds, a.siteIds,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaCodes') or colPickMode == 1 and data.containsKey('areaCodes')))">
a.areaCodes,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modeIds') or colPickMode == 1 and data.containsKey('modeIds')))">
a.modeIds,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status, a.status,
</if> </if>
...@@ -89,18 +97,18 @@ ...@@ -89,18 +97,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="UserEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="UserEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_user insert into mortals_xhx_user
(loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,siteIds,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress) (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,siteIds,areaCodes,modeIds,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
VALUES VALUES
(#{loginName},#{loginPwd},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{siteIds},#{status},#{customerId},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress}) (#{loginName},#{loginPwd},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{siteIds},#{areaCodes},#{modeIds},#{status},#{customerId},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_user insert into mortals_xhx_user
(loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,siteIds,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress) (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,siteIds,areaCodes,modeIds,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.loginName},#{item.loginPwd},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.userType},#{item.siteIds},#{item.status},#{item.customerId},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress}) (#{item.loginName},#{item.loginPwd},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.userType},#{item.siteIds},#{item.areaCodes},#{item.modeIds},#{item.status},#{item.customerId},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress})
</foreach> </foreach>
</insert> </insert>
...@@ -143,6 +151,12 @@ ...@@ -143,6 +151,12 @@
<if test="(colPickMode==0 and data.containsKey('siteIds')) or (colPickMode==1 and !data.containsKey('siteIds'))"> <if test="(colPickMode==0 and data.containsKey('siteIds')) or (colPickMode==1 and !data.containsKey('siteIds'))">
a.siteIds=#{data.siteIds}, a.siteIds=#{data.siteIds},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('areaCodes')) or (colPickMode==1 and !data.containsKey('areaCodes'))">
a.areaCodes=#{data.areaCodes},
</if>
<if test="(colPickMode==0 and data.containsKey('modeIds')) or (colPickMode==1 and !data.containsKey('modeIds'))">
a.modeIds=#{data.modeIds},
</if>
<if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))"> <if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
a.status=#{data.status}, a.status=#{data.status},
</if> </if>
...@@ -260,6 +274,20 @@ ...@@ -260,6 +274,20 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="areaCodes=(case" suffix="ELSE areaCodes end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('areaCodes')) or (colPickMode==1 and !item.containsKey('areaCodes'))">
when a.id=#{item.id} then #{item.areaCodes}
</if>
</foreach>
</trim>
<trim prefix="modeIds=(case" suffix="ELSE modeIds end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('modeIds')) or (colPickMode==1 and !item.containsKey('modeIds'))">
when a.id=#{item.id} then #{item.modeIds}
</if>
</foreach>
</trim>
<trim prefix="status=(case" suffix="ELSE status end),"> <trim prefix="status=(case" suffix="ELSE status end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -602,6 +630,36 @@ ...@@ -602,6 +630,36 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('areaCodes')">
<if test="conditionParamRef.areaCodes != null and conditionParamRef.areaCodes != ''">
${_conditionType_} a.areaCodes like #{${_conditionParam_}.areaCodes}
</if>
<if test="conditionParamRef.areaCodes == null">
${_conditionType_} a.areaCodes is null
</if>
</if>
<if test="conditionParamRef.containsKey('areaCodesList')">
${_conditionType_} a.areaCodes in
<foreach collection="conditionParamRef.areaCodesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('modeIds')">
<if test="conditionParamRef.modeIds != null and conditionParamRef.modeIds != ''">
${_conditionType_} a.modeIds like #{${_conditionParam_}.modeIds}
</if>
<if test="conditionParamRef.modeIds == null">
${_conditionType_} a.modeIds is null
</if>
</if>
<if test="conditionParamRef.containsKey('modeIdsList')">
${_conditionType_} a.modeIds in
<foreach collection="conditionParamRef.modeIdsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('status')"> <if test="conditionParamRef.containsKey('status')">
<if test="conditionParamRef.status != null "> <if test="conditionParamRef.status != null ">
${_conditionType_} a.status = #{${_conditionParam_}.status} ${_conditionType_} a.status = #{${_conditionParam_}.status}
...@@ -793,6 +851,16 @@ ...@@ -793,6 +851,16 @@
<if test='orderCol.siteIds != null and "DESC".equalsIgnoreCase(orderCol.siteIds)'>DESC</if> <if test='orderCol.siteIds != null and "DESC".equalsIgnoreCase(orderCol.siteIds)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('areaCodes')">
a.areaCodes
<if test='orderCol.areaCodes != null and "DESC".equalsIgnoreCase(orderCol.areaCodes)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('modeIds')">
a.modeIds
<if test='orderCol.modeIds != null and "DESC".equalsIgnoreCase(orderCol.modeIds)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('status')"> <if test="orderCol.containsKey('status')">
a.status a.status
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if> <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
......
portal-manager/src/test/java/com/mortals/httpclient/http-client.env.json
View file @ 6cb61c56
{ {
"local": { "portal-local": {
"baseUrl": "http://127.0.0.1:17311/zwfw" "baseUrl": "http://127.0.0.1:17212/zwfw"
}, },
"dev": { "portal-dev": {
"baseUrl": "http://192.168.0.217:17311/zwfw" "baseUrl": "http://192.168.0.217:17212/zwfw"
}, },
"test": { "portal-test": {
"baseUrl": "http://192.168.0.98:11071/zwfw" "baseUrl": "http://192.168.0.98:17212/zwfw"
} }
} }
\ No newline at end of file
portal-manager/src/test/java/com/mortals/httpclient/menu/MenuController.http
View file @ 6cb61c56
...@@ -16,21 +16,21 @@ Authorization: {{authToken}} ...@@ -16,21 +16,21 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"name":"3trs3r", "name":"gtpo3x",
"url":"xrbayn", "url":"bzap53",
"parentId":601, "parentId":841,
"orderId":831, "orderId":493,
"status":1, "status":1,
"linkType":0, "linkType":0,
"groupId":1, "groupId":1,
"groupName":"l1cb09", "groupName":"kozt1p",
"imgPath":"7vx2e3", "imgPath":"768q4p",
"buttonImgPath":"jl6h2u", "buttonImgPath":"8n3owa",
"imgCommPath":"o9s99x", "imgCommPath":"1uozri",
"commMenu":0, "commMenu":0,
"menuType":0, "menuType":0,
"authType":3, "authType":3,
"createUserName":"l2jfb9" "createUserName":"ncx9is"
} }
> {% > {%
......
portal-manager/src/test/java/com/mortals/httpclient/oper/OperLogController.http
View file @ 6cb61c56
...@@ -16,15 +16,15 @@ Authorization: {{authToken}} ...@@ -16,15 +16,15 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"platformMark":"p6u2db", "platformMark":"famkaa",
"userId":392, "userId":915,
"userName":"g9643m", "userName":"yprv3n",
"loginName":"ymarlx", "loginName":"pcui4v",
"requestUrl":"7jeyja", "requestUrl":"b25eh5",
"content":"8yciyz", "content":"a45ur4",
"ip":"0s5jyc", "ip":"jjzv5q",
"logDate":"1653408000000", "logDate":"1654012800000",
"operType":264 "operType":502
} }
> {% > {%
......
portal-manager/src/test/java/com/mortals/httpclient/param/ParamController.http
View file @ 6cb61c56
...@@ -16,16 +16,16 @@ Authorization: {{authToken}} ...@@ -16,16 +16,16 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"name":"uzmb1h", "name":"8rql7o",
"firstOrganize":"26mjzx", "firstOrganize":"pjyp42",
"secondOrganize":"m6q15i", "secondOrganize":"gf5pjy",
"paramKey":"kgob3u", "paramKey":"kj2rte",
"paramValue":"0yeqxi", "paramValue":"43x9fh",
"validStatus":1, "validStatus":1,
"modStatus":4, "modStatus":4,
"displayType":0, "displayType":0,
"remark":"0rc34v", "remark":"icbvr4",
"createUserName":"tnev3i" "createUserName":"z877o6"
} }
> {% > {%
......
portal-manager/src/test/java/com/mortals/httpclient/resource/ResourceController.http
View file @ 6cb61c56
...@@ -16,12 +16,12 @@ Authorization: {{authToken}} ...@@ -16,12 +16,12 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"name":"01takc", "name":"bbhhiu",
"url":"7d2wh0", "url":"78p8sn",
"authType":3, "authType":3,
"sourceType":0, "sourceType":0,
"createUserName":"dhe3wq", "createUserName":"pmsggn",
"userType":337 "userType":792
} }
> {% > {%
......
portal-manager/src/test/java/com/mortals/httpclient/role/RoleAuthController.http
View file @ 6cb61c56
...@@ -16,8 +16,8 @@ Authorization: {{authToken}} ...@@ -16,8 +16,8 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"roleId":447, "roleId":919,
"resourceId":826 "resourceId":633
} }
> {% > {%
......
portal-manager/src/test/java/com/mortals/httpclient/role/RoleController.http
View file @ 6cb61c56
...@@ -16,10 +16,10 @@ Authorization: {{authToken}} ...@@ -16,10 +16,10 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"name":"8r6f57", "name":"5ndoco",
"remark":"0yezau", "remark":"qkazii",
"roleType":2, "roleType":2,
"createUserName":"8cbh3c" "createUserName":"5i3n9e"
} }
> {% > {%
......
portal-manager/src/test/java/com/mortals/httpclient/role/RoleUserController.http
View file @ 6cb61c56
...@@ -16,8 +16,8 @@ Authorization: {{authToken}} ...@@ -16,8 +16,8 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"roleId":559, "roleId":383,
"userId":162 "userId":148
} }
> {% > {%
......
portal-manager/src/test/java/com/mortals/httpclient/system.http 0 → 100644
View file @ 6cb61c56
###登录
POST {{baseUrl}}/login/login
Content-Type: application/json
{
"loginName":"admin",
"password":"admin",
"securityCode":"8888"
}
> {%
client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
client.global.set("authToken", JSON.parse(response.body).data.token);
%}
###首页
POST {{baseUrl}}/login/index
Authorization: {{authToken}}
Content-Type: application/json
{}
portal-manager/src/test/java/com/mortals/httpclient/system/SystemServiceApiController.http
View file @ 6cb61c56
...@@ -16,15 +16,15 @@ Authorization: {{authToken}} ...@@ -16,15 +16,15 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"systemServiceName":"bmop16", "systemServiceName":"o99s5u",
"systemServiceCode":"zs20fh", "systemServiceCode":"nhelz5",
"systemServiceUrl":"r5b6s9", "systemServiceUrl":"to7p8j",
"apiName":"86sw8q", "apiName":"a9jpo2",
"apiUrl":"0", "apiUrl":"0",
"apiVersion":"qks3ye", "apiVersion":"soe6c6",
"apiStatus":1, "apiStatus":1,
"lapseTime":"1653408000000", "lapseTime":"1654012800000",
"apiRemark":"xna6nr" "apiRemark":"6rriap"
} }
> {% > {%
......
portal-manager/src/test/java/com/mortals/httpclient/system/SystemServiceController.http
View file @ 6cb61c56
...@@ -16,15 +16,15 @@ Authorization: {{authToken}} ...@@ -16,15 +16,15 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"systemServiceName":"p0yf4g", "systemServiceName":"pd2nfe",
"systemServiceCode":"18418z", "systemServiceCode":"eluken",
"systemServiceUrl":"509vfm", "systemServiceUrl":"qtc1t4",
"packageName":"2sgr33", "packageName":"ebrlei",
"packagePath":"ragnhb", "packagePath":"cn24qd",
"packageVersion":"lsip63", "packageVersion":"bja5qr",
"apiStatus":421, "apiStatus":784,
"lapseTime":"1653408000000", "lapseTime":"1654012800000",
"packageRemark":"orlq3y" "packageRemark":"jp04vd"
} }
> {% > {%
......
portal-manager/src/test/java/com/mortals/httpclient/table/TableIndexController.http
View file @ 6cb61c56
...@@ -16,8 +16,8 @@ Authorization: {{authToken}} ...@@ -16,8 +16,8 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"tableName":"693q8e", "tableName":"clftc5",
"tableMark":"l3et19", "tableMark":"recb1y",
} }
> {% > {%
......
portal-manager/src/test/java/com/mortals/httpclient/task/TaskController.http
View file @ 6cb61c56
...@@ -16,20 +16,20 @@ Authorization: {{authToken}} ...@@ -16,20 +16,20 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"name":"41b4fh", "name":"dkuwwq",
"taskKey":"3l4pit", "taskKey":"n1cdz1",
"status":0, "status":0,
"excuteService":"nqgteq", "excuteService":"fcwbaz",
"excuteParam":"5zi9vb", "excuteParam":"lhbsxc",
"excuteHost":"rzjd27", "excuteHost":"jq9not",
"excuteStrategy":1, "excuteStrategy":1,
"excuteDate":0, "excuteDate":0,
"excuteTime":"00:00", "excuteTime":"00:00",
"remark":"siu7eb", "remark":"w7enx5",
"lastExcuteHost":"qbpag4", "lastExcuteHost":"qejiuf",
"lastExcuteTime":"1653408000000", "lastExcuteTime":"1654012800000",
"interimExcuteStatus":0, "interimExcuteStatus":0,
"createUserName":"u089fu" "createUserName":"wead9t"
} }
> {% > {%
......
portal-manager/src/test/java/com/mortals/httpclient/uploadfile/UploadfileController.http
View file @ 6cb61c56
...@@ -16,9 +16,9 @@ Authorization: {{authToken}} ...@@ -16,9 +16,9 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"fileName":"a4vhpb", "fileName":"op4s3p",
"filePath":"jm7tb7", "filePath":"3laab2",
"fileType":261, "fileType":635,
} }
> {% > {%
......
portal-manager/src/test/java/com/mortals/httpclient/user/UserController.http
View file @ 6cb61c56
...@@ -16,21 +16,21 @@ Authorization: {{authToken}} ...@@ -16,21 +16,21 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"loginName":"8dgoiw", "loginName":"4yywad",
"loginPwd":"j8fnyb", "loginPwd":"1g4iy0",
"loginLimitAddress":"wl98ae", "loginLimitAddress":"20w7ix",
"realName":"cduvjh", "realName":"am6aml",
"mobile":"u4xqi3", "mobile":"gcznhn",
"phone":"ip3qkh", "phone":"wvq3ct",
"email":"mbs3hu", "email":"lxbz24",
"qq":"a5qkzc", "qq":"a037x3",
"userType":132, "userType":442,
"siteInfo":"p5sp0g", "siteIds":"o48orv",
"status":1, "status":1,
"customerId":109, "customerId":121,
"createUserName":"n57b9k", "createUserName":"6kavzr",
"lastLoginTime":"1653408000000", "lastLoginTime":"1654012800000",
"lastLoginAddress":"ccdf1t" "lastLoginAddress":"hed4ia"
} }
> {% > {%
......
portal-manager/src/test/java/com/mortals/httpclient/valid/ValidCodeController.http
View file @ 6cb61c56
...@@ -16,14 +16,14 @@ Authorization: {{authToken}} ...@@ -16,14 +16,14 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"code":"sk1nnu", "code":"8ejstz",
"url":"9w0alr", "url":"rd1w9i",
"mobile":"cy1jca", "mobile":"o14fm7",
"email":"4bq8qx", "email":"jx8ynm",
"type":0, "type":0,
"sessionId":"vzj0o8", "sessionId":"skrkmf",
"ip":"hb2nqm", "ip":"4jsqg0",
"lapseTime":"1653408000000" "lapseTime":"1654012800000"
} }
> {% > {%
......
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 to comment