diff --git a/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java b/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java index 7d704cd1..85a8d486 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java +++ b/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java @@ -56,6 +56,11 @@ public class BaseEntity implements Serializable this.createBy = createBy; } + public Date getCreateTime() + { + return createTime; + } + public String getCreateTimeStr() { return createTime != null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, createTime) : ""; @@ -81,6 +86,11 @@ public class BaseEntity implements Serializable this.updateBy = updateBy; } + public Date getUpdateTime() + { + return updateTime; + } + public String getUpdateTimeStr() { return updateTime != null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, updateTime) : ""; diff --git a/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java b/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java index f91e900f..b1bb7805 100644 --- a/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java +++ b/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java @@ -107,12 +107,4 @@ public interface UserMapper * @return 结果 */ public User checkEmailUnique(String email); - - /** - * 批量添加用户 - * - * @param userList - * @return - */ - public int batchAddUser(List userList); } diff --git a/src/main/resources/mybatis/system/UserMapper.xml b/src/main/resources/mybatis/system/UserMapper.xml index e1e947e5..e02b1d40 100644 --- a/src/main/resources/mybatis/system/UserMapper.xml +++ b/src/main/resources/mybatis/system/UserMapper.xml @@ -158,38 +158,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysdate() ) - - - insert into sys_user( - dept_id, - login_name, - user_name, - email, - phonenumber, - sex, - password, - salt, - status, - create_by, - remark, - create_time - ) values - - ( - #{item.deptId}, - #{item.loginName}, - #{item.userName}, - #{item.email}, - #{item.phonenumber}, - #{item.sex}, - #{item.password}, - #{item.salt}, - #{item.status}, - #{item.createBy}, - #{item.remark}, - sysdate() - ) - - \ No newline at end of file diff --git a/src/main/resources/static/ajax/libs/layer/layim/data/chatlog.json b/src/main/resources/static/ajax/libs/layer/layim/data/chatlog.json deleted file mode 100644 index 13954d79..00000000 --- a/src/main/resources/static/ajax/libs/layer/layim/data/chatlog.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "status": 1, - "msg": "ok", - "data": [ - { - "id": "100001", - "name": "Beaut-zihan", - "time": "10:23", - "face": "img/a1.jpg" - }, - { - "id": "100002", - "name": "慕容晓晓", - "time": "昨天", - "face": "img/a2.jpg" - }, - { - "id": "1000033", - "name": "乔峰", - "time": "2014-4.22", - "face": "img/a3.jpg" - }, - { - "id": "10000333", - "name": "高圆圆", - "time": "2014-4.21", - "face": "img/a4.jpg" - } - ] -} diff --git a/src/main/resources/static/ajax/libs/layer/layim/data/friend.json b/src/main/resources/static/ajax/libs/layer/layim/data/friend.json deleted file mode 100644 index 13a2b658..00000000 --- a/src/main/resources/static/ajax/libs/layer/layim/data/friend.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "status": 1, - "msg": "ok", - "data": [ - { - "name": "销售部", - "nums": 36, - "id": 1, - "item": [ - { - "id": "100001", - "name": "郭敬明", - "face": "img/a5.jpg" - }, - { - "id": "100002", - "name": "作家崔成浩", - "face": "img/a6.jpg" - }, - { - "id": "1000022", - "name": "韩寒", - "face": "img/a7.jpg" - }, - { - "id": "10000222", - "name": "范爷", - "face": "img/a8.jpg" - }, - { - "id": "100002222", - "name": "小马哥", - "face": "img/a9.jpg" - } - ] - }, - { - "name": "大学同窗", - "nums": 16, - "id": 2, - "item": [ - { - "id": "1000033", - "name": "苏醒", - "face": "img/a9.jpg" - }, - { - "id": "10000333", - "name": "马云", - "face": "img/a8.jpg" - }, - { - "id": "100003", - "name": "鬼脚七", - "face": "img/a7.jpg" - }, - { - "id": "100004", - "name": "谢楠", - "face": "img/a6.jpg" - }, - { - "id": "100005", - "name": "徐峥", - "face": "img/a5.jpg" - } - ] - }, - { - "name": "H+后台主题", - "nums": 38, - "id": 3, - "item": [ - { - "id": "100006", - "name": "柏雪近在它香", - "face": "img/a4.jpg" - }, - { - "id": "100007", - "name": "罗昌平", - "face": "img/a3.jpg" - }, - { - "id": "100008", - "name": "Crystal影子", - "face": "img/a2.jpg" - }, - { - "id": "100009", - "name": "艺小想", - "face": "img/a1.jpg" - }, - { - "id": "100010", - "name": "天猫", - "face": "img/a8.jpg" - }, - { - "id": "100011", - "name": "张泉灵", - "face": "img/a7.jpg" - } - ] - } - ] -} diff --git a/src/main/resources/static/ajax/libs/layer/layim/data/group.json b/src/main/resources/static/ajax/libs/layer/layim/data/group.json deleted file mode 100644 index 3352f656..00000000 --- a/src/main/resources/static/ajax/libs/layer/layim/data/group.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "status": 1, - "msg": "ok", - "data": [ - { - "name": "H+交流群", - "nums": 36, - "id": 1, - "item": [ - { - "id": "101", - "name": "H+ Bug反馈", - "face": "http://tp2.sinaimg.cn/2211874245/180/40050524279/0" - }, - { - "id": "102", - "name": "H+ 技术交流", - "face": "http://tp3.sinaimg.cn/1820711170/180/1286855219/1" - } - ] - }, - { - "name": "Bootstrap", - "nums": 16, - "id": 2, - "item": [ - { - "id": "103", - "name": "Bootstrap中文", - "face": "http://tp2.sinaimg.cn/2211874245/180/40050524279/0" - }, - { - "id": "104", - "name": "Bootstrap资源", - "face": "http://tp3.sinaimg.cn/1820711170/180/1286855219/1" - } - ] - }, - { - "name": "WebApp", - "nums": 106, - "id": 3, - "item": [ - { - "id": "105", - "name": "移动开发", - "face": "http://tp2.sinaimg.cn/2211874245/180/40050524279/0" - }, - { - "id": "106", - "name": "H5前言", - "face": "http://tp3.sinaimg.cn/1820711170/180/1286855219/1" - } - ] - } - ] -} diff --git a/src/main/resources/static/ajax/libs/layer/layim/data/groups.json b/src/main/resources/static/ajax/libs/layer/layim/data/groups.json deleted file mode 100644 index fd0464ad..00000000 --- a/src/main/resources/static/ajax/libs/layer/layim/data/groups.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "status": 1, - "msg": "ok", - "data": [ - { - "id": "100001", - "name": "無言的蒁説", - "face": "img/a1.jpg" - }, - { - "id": "100002", - "name": "婷宝奢侈品", - "face": "img/a2.jpg" - }, - { - "id": "100003", - "name": "忆恨思爱", - "face": "img/a3.jpg" - }, - { - "id": "100004", - "name": "天涯奥拓慢", - "face": "img/a4.jpg" - }, - { - "id": "100005", - "name": "雨落无声的天空", - "face": "img/a5.jpg" - }, - { - "id": "100006", - "name": "李越LycorisRadiate", - "face": "img/a6.jpg" - }, - { - "id": "100007", - "name": "冯胖妞张直丑", - "face": "img/a7.jpg" - }, - { - "id": "100008", - "name": "陈龙hmmm", - "face": "img/a8.jpg" - }, - { - "id": "100009", - "name": "别闹哥胆儿小", - "face": "img/a9.jpg" - }, - { - "id": "100010", - "name": "锅锅锅锅萌哒哒 ", - "face": "img/a10.jpg" - } - ] -}