From f4bc40588f0d134de3bf8d1b23a184dce097149c Mon Sep 17 00:00:00 2001
From: Caps <452713115@qq.com>
Date: Wed, 8 Apr 2020 17:02:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E6=9D=83=E9=99=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kiisoo/ic/domain/entity/PrivilageDomainDO.java |  4 ++--
 .../ic/domain/entity/PrivilageDomainEntityDO.java      |  4 ++--
 .../kiisoo/ic/domain/entity/PrivilageUserDomainDO.java |  4 ++--
 .../service/impl/PrivilageDomainServiceImpl.java       | 10 +++++-----
 .../kiisoo/ic/login/service/impl/LoginServiceImpl.java |  4 ++--
 .../kiisoo/ic/system/entity/PrivilageAccountDO.java    |  4 ++--
 .../kiisoo/ic/system/entity/PrivilagePermissionDO.java |  4 ++--
 .../com/kiisoo/ic/system/entity/PrivilageRoleDO.java   |  4 ++--
 .../ic/system/entity/PrivilageRolePermissionDO.java    |  4 ++--
 .../com/kiisoo/ic/system/entity/PrivilageUserDO.java   |  4 ++--
 .../kiisoo/ic/system/entity/PrivilageUserRoleDO.java   |  4 ++--
 .../service/impl/PrivilageAccountServiceImpl.java      |  4 ++--
 .../service/impl/PrivilagePermissionServiceImpl.java   |  2 +-
 .../system/service/impl/PrivilageRoleServiceImpl.java  |  4 ++--
 .../service/impl/PrivilageUserRoleServiceImpl.java     |  4 ++--
 .../system/service/impl/PrivilageUserServiceImpl.java  |  2 +-
 src/main/resources/mapper/PrivilageDomainDOMapper.xml  |  2 +-
 src/main/resources/mapper/PrivilageRoleDOMapper.xml    |  2 +-
 18 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/domain/entity/PrivilageDomainDO.java b/src/main/java/com/kiisoo/ic/domain/entity/PrivilageDomainDO.java
index 887be04..5117904 100644
--- a/src/main/java/com/kiisoo/ic/domain/entity/PrivilageDomainDO.java
+++ b/src/main/java/com/kiisoo/ic/domain/entity/PrivilageDomainDO.java
@@ -47,12 +47,12 @@ public class PrivilageDomainDO implements Serializable {
     /**
      * 创建时间
      */
-    private Date createdTime;
+    private Date createTime;
 
     /**
      * 更新时间
      */
-    private Date updatedTime;
+    private Date updateTime;
 
 
     /**
diff --git a/src/main/java/com/kiisoo/ic/domain/entity/PrivilageDomainEntityDO.java b/src/main/java/com/kiisoo/ic/domain/entity/PrivilageDomainEntityDO.java
index 8d0c6bc..4852e57 100644
--- a/src/main/java/com/kiisoo/ic/domain/entity/PrivilageDomainEntityDO.java
+++ b/src/main/java/com/kiisoo/ic/domain/entity/PrivilageDomainEntityDO.java
@@ -47,12 +47,12 @@ public class PrivilageDomainEntityDO implements Serializable {
     /**
      * 创建时间
      */
-    private Date createdTime;
+    private Date createTime;
 
     /**
      * 更新时间
      */
-    private Date updatedTime;
+    private Date updateTime;
 
     /**
      * 创建人
diff --git a/src/main/java/com/kiisoo/ic/domain/entity/PrivilageUserDomainDO.java b/src/main/java/com/kiisoo/ic/domain/entity/PrivilageUserDomainDO.java
index 0cf0049..e527edc 100644
--- a/src/main/java/com/kiisoo/ic/domain/entity/PrivilageUserDomainDO.java
+++ b/src/main/java/com/kiisoo/ic/domain/entity/PrivilageUserDomainDO.java
@@ -42,12 +42,12 @@ public class PrivilageUserDomainDO implements Serializable {
     /**
      * 创建时间
      */
-    private Date createdTime;
+    private Date createTime;
 
     /**
      * 更新时间
      */
-    private Date updatedTime;
+    private Date updateTime;
 
     /**
      * 创建人
diff --git a/src/main/java/com/kiisoo/ic/domain/service/impl/PrivilageDomainServiceImpl.java b/src/main/java/com/kiisoo/ic/domain/service/impl/PrivilageDomainServiceImpl.java
index efabb2c..0703b11 100644
--- a/src/main/java/com/kiisoo/ic/domain/service/impl/PrivilageDomainServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/domain/service/impl/PrivilageDomainServiceImpl.java
@@ -70,7 +70,7 @@ public class PrivilageDomainServiceImpl extends ServiceImpl<PrivilageDomainDOMap
         PrivilageUserDomainDO privilageUserDomainDO = new PrivilageUserDomainDO();
         privilageUserDomainDO.setUserId(userId);
         privilageUserDomainDO.setDomainId(domainId);
-        privilageUserDomainDO.setCreatedTime(new Date());
+        privilageUserDomainDO.setCreateTime(new Date());
         //保存用户域
         privilageUserDomainDOMapper.insert(privilageUserDomainDO);
 
@@ -98,7 +98,7 @@ public class PrivilageDomainServiceImpl extends ServiceImpl<PrivilageDomainDOMap
             PrivilageDomainDO insertDomainBean = new PrivilageDomainDO();
             insertDomainBean.setName(DomainEnum.DOMAIN_ALL_SHOP.getDomainName());
             insertDomainBean.setStatus(DataConstants.DOMAIN_STATUS_NORMAL);
-            insertDomainBean.setUpdatedTime(new Date());
+            insertDomainBean.setUpdateTime(new Date());
             privilageDomainDOMapper.insert(insertDomainBean);
 
             //新建角色域关系
@@ -106,7 +106,7 @@ public class PrivilageDomainServiceImpl extends ServiceImpl<PrivilageDomainDOMap
             privilageDomainEntityDO.setDomainId(insertDomainBean.getId());
             privilageDomainEntityDO.setEntityId(roleId);
             privilageDomainEntityDO.setType(DataConstants.DOMAIN_ENTITY_TYPE_ROLE);
-            privilageDomainEntityDO.setCreatedTime(new Date());
+            privilageDomainEntityDO.setCreateTime(new Date());
             privilageDomainEntityDOMapper.insert(privilageDomainEntityDO);
             //回调
             saveAllDate(userId, roleId);
@@ -135,7 +135,7 @@ public class PrivilageDomainServiceImpl extends ServiceImpl<PrivilageDomainDOMap
             bean.setDomainId(domainId);
             bean.setEntityId(entityId);
             bean.setType(DataConstants.DOMAIN_ENTITY_TYPE_SHOP);
-            bean.setCreatedTime(new Date());
+            bean.setCreateTime(new Date());
             addPrivilageDomainEntityList.add(bean);
         });
         if(addPrivilageDomainEntityList != null && addPrivilageDomainEntityList.size() > 0) {
@@ -145,7 +145,7 @@ public class PrivilageDomainServiceImpl extends ServiceImpl<PrivilageDomainDOMap
         PrivilageUserDomainDO privilageUserDomainDO = new PrivilageUserDomainDO();
         privilageUserDomainDO.setUserId(userId);
         privilageUserDomainDO.setDomainId(domainId);
-        privilageUserDomainDO.setCreatedTime(new Date());
+        privilageUserDomainDO.setCreateTime(new Date());
         privilageUserDomainDOMapper.insert(privilageUserDomainDO);
     }
 
diff --git a/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java b/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java
index 9aab456..b523b4b 100644
--- a/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java
@@ -126,8 +126,8 @@ public class LoginServiceImpl implements LoginService {
             accountDO.setLogin(qywxUserId);
             accountDO.setType(AccountEnum.ACCOUNT_TYPE_QYWX.getType());
             accountDO.setStatus(AccountEnum.ACCOUNT_STATUS_NORMAL.getType());
-            accountDO.setCreatedTime(new Date());
-            accountDO.setUpdatedTime(new Date());
+            accountDO.setCreateTime(new Date());
+            accountDO.setUpdateTime(new Date());
             accountDO.setUserId(userId);
             privilageAccountDOMapper.insert(accountDO);
         }
diff --git a/src/main/java/com/kiisoo/ic/system/entity/PrivilageAccountDO.java b/src/main/java/com/kiisoo/ic/system/entity/PrivilageAccountDO.java
index 697e6b5..73d9bc4 100644
--- a/src/main/java/com/kiisoo/ic/system/entity/PrivilageAccountDO.java
+++ b/src/main/java/com/kiisoo/ic/system/entity/PrivilageAccountDO.java
@@ -62,12 +62,12 @@ public class PrivilageAccountDO implements Serializable {
     /**
      * 创建时间
      */
-    private Date createdTime;
+    private Date createTime;
 
     /**
      * 更新时间
      */
-    private Date updatedTime;
+    private Date updateTime;
 
     /**
      * 创建人
diff --git a/src/main/java/com/kiisoo/ic/system/entity/PrivilagePermissionDO.java b/src/main/java/com/kiisoo/ic/system/entity/PrivilagePermissionDO.java
index 60839f1..6c6d127 100644
--- a/src/main/java/com/kiisoo/ic/system/entity/PrivilagePermissionDO.java
+++ b/src/main/java/com/kiisoo/ic/system/entity/PrivilagePermissionDO.java
@@ -52,12 +52,12 @@ public class PrivilagePermissionDO implements Serializable {
     /**
      * 创建时间
      */
-    private LocalDateTime createdTime;
+    private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
-    private LocalDateTime updatedTime;
+    private LocalDateTime updateTime;
 
     /**
      * 创建人
diff --git a/src/main/java/com/kiisoo/ic/system/entity/PrivilageRoleDO.java b/src/main/java/com/kiisoo/ic/system/entity/PrivilageRoleDO.java
index e190c1d..e120f6b 100644
--- a/src/main/java/com/kiisoo/ic/system/entity/PrivilageRoleDO.java
+++ b/src/main/java/com/kiisoo/ic/system/entity/PrivilageRoleDO.java
@@ -49,12 +49,12 @@ public class PrivilageRoleDO implements Serializable {
     /**
      * 创建时间
      */
-    private Date createdTime;
+    private Date createTime;
 
     /**
      * 更新时间
      */
-    private Date updatedTime;
+    private Date updateTime;
 
     /**
      * 创建人
diff --git a/src/main/java/com/kiisoo/ic/system/entity/PrivilageRolePermissionDO.java b/src/main/java/com/kiisoo/ic/system/entity/PrivilageRolePermissionDO.java
index b020252..e6d053d 100644
--- a/src/main/java/com/kiisoo/ic/system/entity/PrivilageRolePermissionDO.java
+++ b/src/main/java/com/kiisoo/ic/system/entity/PrivilageRolePermissionDO.java
@@ -42,12 +42,12 @@ public class PrivilageRolePermissionDO implements Serializable {
     /**
      * 创建时间
      */
-    private Date createdTime;
+    private Date createTime;
 
     /**
      * 更新时间
      */
-    private Date updatedTime;
+    private Date updateTime;
 
     /**
      * 创建人
diff --git a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java
index 112b8f6..c161c0a 100644
--- a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java
+++ b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java
@@ -62,12 +62,12 @@ public class PrivilageUserDO implements Serializable {
     /**
      * 创建时间
      */
-    private Date createdTime;
+    private Date createTime;
 
     /**
      * 更新时间
      */
-    private Date updatedTime;
+    private Date updateTime;
 
     /**
      * 创建人
diff --git a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserRoleDO.java b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserRoleDO.java
index 6ff893f..221fa69 100644
--- a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserRoleDO.java
+++ b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserRoleDO.java
@@ -42,12 +42,12 @@ public class PrivilageUserRoleDO implements Serializable {
     /**
      * 创建时间
      */
-    private Date createdTime;
+    private Date createTime;
 
     /**
      * 更新时间
      */
-    private Date updatedTime;
+    private Date updateTime;
 
     /**
      * 创建人
diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java
index 75aea31..ad694f4 100644
--- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java
@@ -204,7 +204,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
         PrivilageAccountDO privilageAccountDO1 = new PrivilageAccountDO();
         privilageAccountDO1.setId(modifyAccountInput.getAccountId());
         privilageAccountDO1.setLogin(modifyAccountInput.getAccount());
-        privilageAccountDO1.setUpdatedTime(new Date());
+        privilageAccountDO1.setUpdateTime(new Date());
         //修改了密码
         if (!privilageAccountDO.getPassword().equals(modifyAccountInput.getPassword())) {
             privilageAccountDO1.setPassword(MD5FileUtil.getMD5String(modifyAccountInput.getPassword()));
@@ -214,7 +214,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
         PrivilageUserDO privilageUserDO = new PrivilageUserDO();
         privilageUserDO.setId(modifyAccountInput.getUserId());
         privilageUserDO.setName(modifyAccountInput.getUserName());
-        privilageUserDO.setUpdatedTime(new Date());
+        privilageUserDO.setUpdateTime(new Date());
         privilageUserDOMapper.updateById(privilageUserDO);
 
         //保存用户角色
diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilagePermissionServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilagePermissionServiceImpl.java
index 4619f20..ec4a65b 100644
--- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilagePermissionServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilagePermissionServiceImpl.java
@@ -136,7 +136,7 @@ public class PrivilagePermissionServiceImpl extends ServiceImpl<PrivilagePermiss
             PrivilageRolePermissionDO privilageRolePermissionDO = new PrivilageRolePermissionDO();
             privilageRolePermissionDO.setPermissionId(permissionId);
             privilageRolePermissionDO.setRoleId(roleId);
-            privilageRolePermissionDO.setCreatedTime(new Date());
+            privilageRolePermissionDO.setCreateTime(new Date());
             privilageRolePermissionDOMapper.insert(privilageRolePermissionDO);
         });
         return false;
diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageRoleServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageRoleServiceImpl.java
index fab710e..1fb33fd 100644
--- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageRoleServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageRoleServiceImpl.java
@@ -59,7 +59,7 @@ public class PrivilageRoleServiceImpl extends ServiceImpl<PrivilageRoleDOMapper,
         privilageRoleDO.setName(roleName);
         privilageRoleDO.setCode(PinYinUtil.toPinYin(roleName));
         privilageRoleDO.setOperation(roleName);
-        privilageRoleDO.setCreatedTime(new Date());
+        privilageRoleDO.setCreateTime(new Date());
         privilageRoleDOMapper.insert(privilageRoleDO);
         return true;
     }
@@ -91,7 +91,7 @@ public class PrivilageRoleServiceImpl extends ServiceImpl<PrivilageRoleDOMapper,
         PrivilageRoleDO roleDO = new PrivilageRoleDO();
         roleDO.setId(roleId);
         roleDO.setName(roleName);
-        roleDO.setUpdatedTime(new Date());
+        roleDO.setUpdateTime(new Date());
         roleDO.setUpdateBy(Constants.SYS_OPERATION);
         privilageRoleDOMapper.updateById(roleDO);
         return true;
diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageUserRoleServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageUserRoleServiceImpl.java
index 050d359..28af9b7 100644
--- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageUserRoleServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageUserRoleServiceImpl.java
@@ -35,7 +35,7 @@ public class PrivilageUserRoleServiceImpl extends ServiceImpl<PrivilageUserRoleD
         PrivilageUserRoleDO privilageUserRoleDO = new PrivilageUserRoleDO();
         privilageUserRoleDO.setRoleId(roleId);
         privilageUserRoleDO.setUserId(userId);
-        privilageUserRoleDO.setCreatedTime(new Date());
+        privilageUserRoleDO.setCreateTime(new Date());
         privilageUserRoleDOMapper.insert(privilageUserRoleDO);
         return privilageUserRoleDO.getId();
     }
@@ -58,7 +58,7 @@ public class PrivilageUserRoleServiceImpl extends ServiceImpl<PrivilageUserRoleD
         PrivilageUserRoleDO privilageUserRoleDO = new PrivilageUserRoleDO();
         privilageUserRoleDO.setUserId(userId);
         privilageUserRoleDO.setRoleId(roleId);
-        privilageUserRoleDO.setCreatedTime(new Date());
+        privilageUserRoleDO.setCreateTime(new Date());
         privilageUserRoleDOMapper.insert(privilageUserRoleDO);
     }
 }
diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageUserServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageUserServiceImpl.java
index 93de7e1..d04786c 100644
--- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageUserServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageUserServiceImpl.java
@@ -44,7 +44,7 @@ public class PrivilageUserServiceImpl extends ServiceImpl<PrivilageUserDOMapper,
         PrivilageUserDO privilageUserDO = new PrivilageUserDO();
         privilageUserDO.setName(userName);
         privilageUserDO.setStatus(UserEnum.USER_STATUS_NORMAL.getType());
-        privilageUserDO.setCreatedTime(new Date());
+        privilageUserDO.setCreateTime(new Date());
         privilageUserDOMapper.insert(privilageUserDO);
         return privilageUserDO.getId();
     }
diff --git a/src/main/resources/mapper/PrivilageDomainDOMapper.xml b/src/main/resources/mapper/PrivilageDomainDOMapper.xml
index 6e269df..0337af9 100644
--- a/src/main/resources/mapper/PrivilageDomainDOMapper.xml
+++ b/src/main/resources/mapper/PrivilageDomainDOMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.kiisoo.ic.domain.mapper.PrivilageDomainDOMapper">
 
     <select id="selectDomain" resultType="com.kiisoo.ic.domain.entity.PrivilageDomainDO">
-      SELECT t1.id as id, t1.name as `name`, t1.status as `status`, t1.parent_id as parentId, t1.created_time as createdTime, t1.updated_time as updatedTime
+      SELECT t1.id as id, t1.name as `name`, t1.status as `status`, t1.parent_id as parentId, t1.created_time as createTime, t1.updated_time as updateTime
         FROM `privilage_domain` t1, privilage_domain_entity t2
         where t1.id = t2.domain_id
         and t2.type = #{type}
diff --git a/src/main/resources/mapper/PrivilageRoleDOMapper.xml b/src/main/resources/mapper/PrivilageRoleDOMapper.xml
index b0a6d39..a09cad7 100644
--- a/src/main/resources/mapper/PrivilageRoleDOMapper.xml
+++ b/src/main/resources/mapper/PrivilageRoleDOMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.kiisoo.ic.system.mapper.PrivilageRoleDOMapper">
 
     <select id="selectRoleByUserId" resultType="com.kiisoo.ic.system.entity.PrivilageRoleDO">
-      select t3.id as id ,  t3.code as `code`, t3.name as `name`, t3.operation as `operation`, t3.created_time as createdTime, t3.updated_time as updatedTime
+      select t3.id as id ,  t3.code as `code`, t3.name as `name`, t3.operation as `operation`, t3.created_time as createTime, t3.updated_time as updateTime
         from privilage_user t1, privilage_user_role t2, privilage_role t3
         where t1.id = t2.user_id
         and t2.role_id = t3.id