From a71853223694f341cee1b8b01efbfb56a0293af9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Jun 2020 15:03:08 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java | 16 +
src/main/resources/templates/febs/views/modules/member/member.html | 325 +++++++++++++++++++++++++++
src/main/resources/templates/febs/views/modules/test.html | 10
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 35 ++
src/main/resources/application-prod.yml | 4
src/main/resources/application-test.yml | 4
src/main/java/com/xcong/excoin/FebsShiroApplication.java | 1
src/main/java/com/xcong/excoin/common/entity/BaseEntity.java | 33 ++
src/main/resources/mapper/modules/MemberMapper.xml | 33 ++
src/main/java/com/xcong/excoin/common/runner/FebsStartedUpRunner.java | 4
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 152 ++++++++++++
src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java | 23 +
src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java | 14 +
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 27 ++
src/main/resources/application-dev.yml | 6
15 files changed, 678 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/FebsShiroApplication.java b/src/main/java/com/xcong/excoin/FebsShiroApplication.java
index e28657d..46bea12 100644
--- a/src/main/java/com/xcong/excoin/FebsShiroApplication.java
+++ b/src/main/java/com/xcong/excoin/FebsShiroApplication.java
@@ -14,6 +14,7 @@
@SpringBootApplication
@EnableTransactionManagement
@MapperScan("com.xcong.excoin.*.mapper")
+@MapperScan("com.xcong.excoin.*.*.mapper")
public class FebsShiroApplication {
public static void main(String[] args) {
diff --git a/src/main/java/com/xcong/excoin/common/entity/BaseEntity.java b/src/main/java/com/xcong/excoin/common/entity/BaseEntity.java
new file mode 100644
index 0000000..ead47ad
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/common/entity/BaseEntity.java
@@ -0,0 +1,33 @@
+package com.xcong.excoin.common.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author wzy
+ * @date 2020-04-24 14:58
+ **/
+@Data
+public class BaseEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id",type = IdType.AUTO)
+ private Long id;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ private Integer version;
+}
diff --git a/src/main/java/com/xcong/excoin/common/runner/FebsStartedUpRunner.java b/src/main/java/com/xcong/excoin/common/runner/FebsStartedUpRunner.java
index da55cb1..57e5cbe 100644
--- a/src/main/java/com/xcong/excoin/common/runner/FebsStartedUpRunner.java
+++ b/src/main/java/com/xcong/excoin/common/runner/FebsStartedUpRunner.java
@@ -44,7 +44,7 @@
log.error("| |_ / /\\ | | | |");
log.error("|_| /_/--\\ |_| |_|__");
log.error(" ");
- log.error("FEBS启动失败，{}", e.getMessage());
+ log.error("启动失败，{}", e.getMessage());
log.error("Redis连接异常，请检查Redis连接配置并确保Redis服务已启动");
// 关闭 FEBS
context.close();
@@ -63,7 +63,7 @@
log.info("/ /` / / \\ | |\\/| | |_) | | | |_ | | | |_ ");
log.info("\\_\\_, \\_\\_/ |_| | |_| |_|__ |_|__ |_| |_|__ ");
log.info(" ");
- log.info("FEBS 权限系统启动完毕，地址：{}", url);
+ log.info("权限系统启动完毕，地址：{}", url);
boolean auto = febsProperties.isAutoOpenBrowser();
if (auto && StringUtils.equalsIgnoreCase(active, FebsConstant.DEVELOP)) {
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
new file mode 100644
index 0000000..d0002ee
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
@@ -0,0 +1,35 @@
+package com.xcong.excoin.modules.member.controller;
+
+import com.xcong.excoin.common.controller.BaseController;
+import com.xcong.excoin.common.entity.FebsResponse;
+import com.xcong.excoin.common.entity.QueryRequest;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.service.IMemberService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @author wzy
+ * @date 2020-06-10
+ **/
+@Slf4j
+@Validated
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(value = "/member")
+public class MemberController extends BaseController {
+
+ private final IMemberService memberService;
+
+ @GetMapping("getList")
+ public FebsResponse getList(MemberEntity member, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findMemberListInPage(member, request));
+ return new FebsResponse().success().data(data);
+ }
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
new file mode 100644
index 0000000..c7e9b55
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
@@ -0,0 +1,23 @@
+package com.xcong.excoin.modules.member.controller;
+
+import com.xcong.excoin.common.entity.FebsConstant;
+import com.xcong.excoin.common.utils.FebsUtil;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author wzy
+ * @date 2020-06-10
+ **/
+@Controller("memberView")
+@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/member")
+public class ViewController {
+
+ @GetMapping("member")
+ @RequiresPermissions("member:view")
+ public String member() {
+ return FebsUtil.view("modules/member/member");
+ }
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
new file mode 100644
index 0000000..c259a34
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
@@ -0,0 +1,152 @@
+package com.xcong.excoin.modules.member.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xcong.excoin.common.entity.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 会员信息实体
+ *
+ * @author wzy
+ * @date 2020-05-12
+ **/
+@Data
+@TableName("member")
+public class MemberEntity extends BaseEntity {
+
+ /**
+ * 账号状态 - 禁用
+ */
+ public static final Integer ACCOUNT_STATUS_DISABLED = 0;
+
+ /**
+ * 账号状态 - 启用
+ */
+ public static final Integer ACCOUNT_STATUS_ENABLE = 1;
+
+ /**
+ * 账号代理级别
+ */
+ public static final Integer ACCOUNT_AGENT_LEVEL = 6;
+
+ /**
+ * 账号类型 手机
+ */
+ public static final Integer ACCOUNT_TYPE_PHONE = 1;
+
+ /**
+ * 账号类型 邮箱
+ */
+ public static final Integer ACCOUNT_TYPE_EMAIL = 2;
+
+ /**
+ * 实名认证 审核通过
+ */
+ public static final Integer CERTIFY_STATUS_Y = 1;
+ /**
+ * 实名认证 审核不通过
+ */
+ public static final Integer CERTIFY_STATUS_N = 0;
+ /**
+ * 实名认证 审核中
+ */
+ public static final Integer CERTIFY_STATUS_ING = 2;
+ /**
+ * 实名认证 未提交
+ */
+ public static final Integer CERTIFY_STATUS_UN_SUBMIT = 3;
+
+ public static final int IS_PROFIT_Y = 1;
+
+ public static final int IS_PROFIT_N = 0;
+
+ /**
+ * 手机号(包含国际手机号)
+ */
+ private String phone;
+
+ /**
+ * 邮箱
+ */
+ private String email;
+
+ /**
+ * 登陆密码
+ */
+ private String password;
+
+ /**
+ * 交易密码
+ */
+ private String tradePassword;
+
+ /**
+ * 交易密码时效性设置
+ */
+ private Integer tradeAgingSetting;
+
+ /**
+ * 邀请码
+ */
+ private String inviteId;
+
+ /**
+ * 账号状态 0-禁用 1-启用
+ */
+ private Integer accountStatus;
+
+ /**
+ * 上级推荐人id
+ */
+ private String refererId;
+
+ /**
+ * 上级推荐人ID链
+ */
+ private String refererIds;
+
+ /**
+ * 账号类型 1-正常账号 2-测试账号
+ */
+ private Integer accountType;
+
+ /**
+ * 代理级别
+ */
+ private Integer agentLevel;
+
+ /**
+ * 实名认证状态 0-审核未通过 1-审核通过 2-等待审核
+ */
+ private Integer certifyStatus;
+
+ /**
+ * 身份证号
+ */
+ private String idcardNo;
+
+ /**
+ * 是否设置盈亏难度系数 0-否1-是
+ */
+ private Integer isProfit;
+
+ /**
+ * 是否设置预估强平价系数 0-否1-是
+ */
+ private Integer isForce;
+
+ @TableField(exist = false)
+ private String account;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date startTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date endTime;
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
new file mode 100644
index 0000000..788d97b
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
@@ -0,0 +1,16 @@
+package com.xcong.excoin.modules.member.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author wzy
+ * @date 2020-06-10
+ **/
+public interface MemberMapper extends BaseMapper<MemberEntity> {
+
+ IPage<MemberEntity> selectMemberListInPage(Page<MemberEntity> page, @Param("record") MemberEntity memberEntity);
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java b/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
new file mode 100644
index 0000000..4b0a602
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
@@ -0,0 +1,14 @@
+package com.xcong.excoin.modules.member.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xcong.excoin.common.entity.QueryRequest;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
+
+/**
+ * @author helius
+ */
+public interface IMemberService extends IService<MemberEntity> {
+
+ IPage<MemberEntity> findMemberListInPage(MemberEntity memberEntity, QueryRequest request);
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
new file mode 100644
index 0000000..332c400
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -0,0 +1,27 @@
+package com.xcong.excoin.modules.member.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xcong.excoin.common.entity.QueryRequest;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.mapper.MemberMapper;
+import com.xcong.excoin.modules.member.service.IMemberService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * @author wzy
+ * @date 2020-06-10
+ **/
+@Service
+public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberEntity> implements IMemberService {
+
+
+ @Override
+ public IPage<MemberEntity> findMemberListInPage(MemberEntity memberEntity, QueryRequest request) {
+ Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.baseMapper.selectMemberListInPage(page, memberEntity);
+ }
+}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 144ecf0..49ce671 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -15,10 +15,10 @@
datasource:
# 数据源-1，名称为 base
base:
- username: root
- password: root
+ username: ct_test
+ password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/febs_base?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 6df33a3..07a5012 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -15,10 +15,10 @@
datasource:
# 数据源-1，名称为 base
base:
- username: root
+ username: ct_test
password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/febs_base?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 6df33a3..07a5012 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -15,10 +15,10 @@
datasource:
# 数据源-1，名称为 base
base:
- username: root
+ username: ct_test
password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/febs_base?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
new file mode 100644
index 0000000..380a747
--- /dev/null
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xcong.excoin.modules.member.mapper.MemberMapper">
+
+
+ <select id="selectMemberListInPage" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
+ select * from member
+ <where>
+ <if test="record != null" >
+ <if test="record.startTime!=null">
+ and create_time >=#{record.startTime}
+ </if>
+ <if test="record.endTime!=null">
+ and #{record.endTime} >= create_time
+ </if>
+ <if test="record.account!=null and record.account!=''">
+ and (phone = #{record.account} or email = #{record.account} or invite_id=#{record.account})
+ </if>
+ <if test="record.accountStatus!=null">
+ and account_status = #{record.accountStatus}
+ </if>
+ <if test="record.accountType != null" >
+ and account_type = #{record.accountType}
+ </if>
+ <if test="record.certifyStatus != null">
+ and certify_status = #{record.certifyStatus}
+ </if>
+ </if>
+ </where>
+ order by create_time desc
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/member/member.html b/src/main/resources/templates/febs/views/modules/member/member.html
new file mode 100644
index 0000000..e987cae
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/member/member.html
@@ -0,0 +1,325 @@
+<div class="layui-fluid layui-anim febs-anim" id="febs-user" lay-title="会员列表">
+ <div class="layui-row febs-container">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <div class="layui-card-body febs-table-full">
+ <form class="layui-form layui-table-form" lay-filter="user-table-form">
+ <div class="layui-row">
+ <div class="layui-col-md10">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">创建时间</label>
+ <div class="layui-input-inline">
+ <input type="text" name="createTime" id="user-createTime" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">账号类型</label>
+ <div class="layui-input-inline">
+ <select name="accountType">
+ <option value=""></option>
+ <option value="1">测试账号</option>
+ <option value="2">正常账号</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">账号状态</label>
+ <div class="layui-input-inline">
+ <select name="accountStatus">
+ <option value=""></option>
+ <option value="0">禁用</option>
+ <option value="1">正常</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">实名状态</label>
+ <div class="layui-input-inline">
+ <select name="certifyStatus">
+ <option value=""></option>
+ <option value="0">未通过</option>
+ <option value="1">审核中</option>
+ <option value="2">审核通过</option>
+ <option value="2">未实名</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
+ <i class="layui-icon"></i>
+ </div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
+ <i class="layui-icon"></i>
+ </div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary table-action action-more"
+ shiro:hasAnyPermissions="user:add,user:update,user:password:reset,user:export">
+ <i class="layui-icon"></i>
+ </div>
+ </div>
+ </div>
+ </form>
+ <table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<!-- 表格字段状态格式化 start -->
+<script type="text/html" id="certify-status">
+ {{#
+ var certifyStatus = {
+ 0: {title: '未通过', color: 'red'},
+ 1: {title: '审核中', color: 'blue'},
+ 2: {title: '审核通过', color: 'green'},
+ 3: {title: '未实名', color: 'cyan'}
+ }[d.certifyStatus];
+ }}
+ <span class="layui-badge febs-tag-{{certifyStatus.color}}">{{ certifyStatus.title }}</span>
+</script>
+<script type="text/html" id="account-type">
+ {{#
+ var accountType = {
+ 2: {title: '正常账号'},
+ 1: {title: '测试账号'}
+ }[d.accountType];
+ }}
+ <span>{{ accountType.title }}</span>
+</script>
+<script type="text/html" id="account-status">
+ {{#
+ var accountStatus = {
+ 1: {title: '正常', color : 'blue'},
+ 0: {title: '禁用', color : 'red'}
+ }[d.accountStatus];
+ }}
+ <span class="layui-badge febs-bg-{{accountStatus.color}}">{{ accountStatus.title }}</span>
+</script>
+<!-- 表格字段状态格式化 start -->
+
+<!-- 表格操作栏 start -->
+<script type="text/html" id="user-option">
+ <span shiro:lacksPermission="user:view,user:update,user:delete">
+ <span class="layui-badge-dot febs-bg-orange"></span> 无权限
+ </span>
+ <a lay-event="detail" shiro:hasPermission="user:view"><i
+ class="layui-icon febs-edit-area febs-green"></i></a>
+ <a lay-event="edit" shiro:hasPermission="user:update"><i
+ class="layui-icon febs-edit-area febs-blue"></i></a>
+ <a lay-event="del" shiro:hasPermission="user:delete"><i class="layui-icon febs-edit-area febs-red"></i></a>
+</script>
+<!-- 表格操作栏 end -->
+<script data-th-inline="none" type="text/javascript">
+ // 引入组件并初始化
+ layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () {
+ var $ = layui.jquery,
+ laydate = layui.laydate,
+ febs = layui.febs,
+ form = layui.form,
+ table = layui.table,
+ treeSelect = layui.treeSelect,
+ dropdown = layui.dropdown,
+ $view = $('#febs-user'),
+ $query = $view.find('#query'),
+ $reset = $view.find('#reset'),
+ $searchForm = $view.find('form'),
+ sortObject = {field: 'createTime', type: null},
+ tableIns,
+ createTimeFrom,
+ createTimeTo;
+
+ form.render();
+
+ // 表格初始化
+ initTable();
+
+ // 时间组件
+ laydate.render({
+ elem: '#user-createTime',
+ range: true,
+ trigger: 'click'
+ });
+
+ // 新增下拉组件
+ dropdown.render({
+ elem: $view.find('.action-more'),
+ click: function (name, elem, event) {
+ var checkStatus = table.checkStatus('userTable');
+ if (name === 'add') {
+ febs.modal.open('新增用户', 'system/user/add', {
+ btn: ['提交', '重置'],
+ area: $(window).width() <= 750 ? '95%' : '50%',
+ offset: '30px',
+ yes: function (index, layero) {
+ $('#user-add').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ $('#user-add').find('#reset').trigger('click');
+ return false;
+ }
+ });
+ }
+ if (name === 'delete') {
+ if (!checkStatus.data.length) {
+ febs.alert.warn('请选择需要删除的用户');
+ } else {
+ febs.modal.confirm('删除用户', '确定删除该用户？', function () {
+ var userIds = [];
+ layui.each(checkStatus.data, function (key, item) {
+ userIds.push(item.userId)
+ });
+ deleteUsers(userIds.join(','));
+ });
+ }
+ }
+ if (name === 'reset') {
+ if (!checkStatus.data.length) {
+ febs.alert.warn('请选择需要重置密码的用户');
+ } else {
+ var usernames = [];
+ layui.each(checkStatus.data, function (key, item) {
+ usernames.push(item.username)
+ });
+ febs.post(ctx + 'user/password/reset/' + usernames.join(','), null, function () {
+ febs.alert.success('所选用户密码已重置为1234qwer');
+ });
+ }
+ }
+ if (name === 'export') {
+ var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
+ params.pageSize = $view.find(".layui-laypage-limits option:selected").val();
+ params.pageNum = $view.find(".layui-laypage-em").next().html();
+ febs.download(ctx + 'user/excel', params, '用户信息表.xlsx');
+ }
+ },
+ options: [{
+ name: 'add',
+ title: '新增用户',
+ perms: 'user:add'
+ }, {
+ name: 'delete',
+ title: '删除用户',
+ perms: 'user:delete'
+ }, {
+ name: 'reset',
+ title: '密码重置',
+ perms: 'user:password:reset'
+ }, {
+ name: 'export',
+ title: '导出Excel',
+ perms: 'user:export'
+ }]
+ });
+
+ // 下拉框选择器
+ treeSelect.render({
+ elem: $view.find('#dept'),
+ type: 'get',
+ data: ctx + 'dept/select/tree',
+ placeholder: '请选择',
+ search: false
+ });
+
+ // 初始化表格操作栏各个按钮功能
+ table.on('tool(userTable)', function (obj) {
+ var data = obj.data,
+ layEvent = obj.event;
+ if (layEvent === 'detail') {
+ febs.modal.view('用户信息', 'system/user/detail/' + data.username, {
+ area: $(window).width() <= 750 ? '95%' : '660px'
+ });
+ }
+ if (layEvent === 'del') {
+ febs.modal.confirm('删除用户', '确定删除该用户？', function () {
+ deleteUsers(data.userId);
+ });
+ }
+ if (layEvent === 'edit') {
+ febs.modal.open('修改用户', 'system/user/update/' + data.username, {
+ area: $(window).width() <= 750 ? '90%' : '50%',
+ offset: '30px',
+ btn: ['提交', '取消'],
+ yes: function (index, layero) {
+ $('#user-update').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
+ });
+
+ // 查询按钮
+ $query.on('click', function () {
+ var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
+ tableIns.reload({where: params, page: {curr: 1}});
+ });
+
+ // 刷新按钮
+ $reset.on('click', function () {
+ $searchForm[0].reset();
+ treeSelect.revokeNode('dept');
+ sortObject.type = 'null';
+ createTimeTo = null;
+ createTimeFrom = null;
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ });
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'userTable',
+ url: ctx + 'member/getList',
+ cols: [[
+ {type: 'checkbox'},
+ {field: 'phone', title: '手机号', minWidth: 165},
+ {field: 'email', title: '邮箱', minWidth: 200},
+ {field: 'inviteId', title: '邀请码'},
+ {field: 'refererId', title: '上级邀请码'},
+ {title: '账号类型', templet: '#account-type'},
+ {title: '账号状态', templet: '#account-status'},
+ {title: '审核状态', templet: '#certify-status'},
+ {field: 'createTime', title: '注册时间', minWidth: 180},
+ {title: '操作', toolbar: '#user-option', minWidth: 140, fixed : 'right'}
+ ]]
+ });
+ }
+
+ // 获取查询参数
+ function getQueryParams() {
+ var createTime = $searchForm.find('input[name="createTime"]').val();
+ if (createTime) {
+ createTimeFrom = createTime.split(' - ')[0];
+ createTimeTo = createTime.split(' - ')[1];
+ }
+ return {
+ startTime: createTimeFrom,
+ endTime: createTimeTo,
+ account: $searchForm.find('input[name="account"]').val().trim(),
+ accountStatus: $searchForm.find("select[name='accountStatus']").val(),
+ accountType: $searchForm.find("select[name='accountType']").val(),
+ certifyStatus: $searchForm.find("select[name='certifyStatus']").val(),
+ invalidate_ie_cache: new Date()
+ };
+ }
+
+ function deleteUsers(userIds) {
+ var currentUserId = currentUser.userId + '';
+ if (('' + userIds).split(',').indexOf(currentUserId) !== -1) {
+ febs.alert.warn('所选用户包含当前登录用户，无法删除');
+ return;
+ }
+ febs.get(ctx + 'user/delete/' + userIds, null, function () {
+ febs.alert.success('删除用户成功');
+ $query.click();
+ });
+ }
+ })
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/test.html b/src/main/resources/templates/febs/views/modules/test.html
new file mode 100644
index 0000000..566549b
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/test.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
--
Gitblit v1.9.1