From 86f301314b1d8ae41f9411a0a544d4bd8d97fb90 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 2 Apr 2020 10:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF-=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/UserRoleDTO.java  |  5 ++++
 .../main/java/com/epmet/dao/UserRoleDao.java  |  2 --
 .../service/impl/UserResiInfoServiceImpl.java | 27 ++++++++++++-------
 .../src/main/resources/mapper/RoleDao.xml     | 22 ---------------
 .../src/main/resources/mapper/UserRoleDao.xml | 27 -------------------
 5 files changed, 23 insertions(+), 60 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java
index f25d0ec9f6..e5f599b49a 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java
@@ -54,6 +54,11 @@ public class UserRoleDTO implements Serializable {
      */
 	private String roleId;
 
+	/**
+	 * 所属端App
+	 */
+	private String app;
+
 	/**
 	 * 角色Key值
 	 */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java
index 33a3974f41..5fdd6ca3db 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java
@@ -43,6 +43,4 @@ public interface UserRoleDao extends BaseDao<UserRoleEntity> {
      **/
     List<UserRoleResultDTO> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
 
-    boolean saveResiRole(UserRoleDTO userRoleDTO);
-
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
index 715dd1a58d..54ff59b1c3 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
@@ -169,15 +170,23 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	 */
 	@Transactional(rollbackFor = Exception.class)
 	public void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) {
-		Date date = new Date();
-		userResiInfoDTO.setId(IdWorker.get32UUID());
-		userResiInfoDTO.setDelFlag(NumConstant.ZERO);
-		userResiInfoDTO.setRevision(NumConstant.ZERO);
-		userResiInfoDTO.setCreatedBy(userResiInfoDTO.getUserId());
-		userResiInfoDTO.setCreatedTime(date);
-		userResiInfoDTO.setUpdatedBy(userResiInfoDTO.getUserId());
-		userResiInfoDTO.setUpdatedTime(date);
-		userResiInfoDao.saveUserResiInfo(userResiInfoDTO);
+        //1:注册信息表新增数据
+        Date date = new Date();
+        userResiInfoDTO.setId(IdWorker.get32UUID());
+        userResiInfoDTO.setDelFlag(NumConstant.ZERO);
+        userResiInfoDTO.setRevision(NumConstant.ZERO);
+        userResiInfoDTO.setCreatedBy(userResiInfoDTO.getUserId());
+        userResiInfoDTO.setCreatedTime(date);
+        userResiInfoDTO.setUpdatedBy(userResiInfoDTO.getUserId());
+        userResiInfoDTO.setUpdatedTime(date);
+        userResiInfoDao.saveUserResiInfo(userResiInfoDTO);
+        //2:角色表新增角色数据
+        UserRoleDTO userRoleDTO = new UserRoleDTO();
+        userRoleDTO.setCustomerId(userResiInfoDTO.getCustomerId());
+        userRoleDTO.setUserId(userResiInfoDTO.getUserId());
+        userRoleDTO.setApp(userResiInfoDTO.getApp());
+        userRoleDTO.setRoleKey(EpmetRoleKeyConstant.REGISTERED_RESI);
+        userRoleService.saveUserRole(userRoleDTO);
 	}
 
 	/**
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml
index 0c7760ef61..bb0ed8dbd8 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml
@@ -28,26 +28,4 @@
             and DEL_FLAG = 0
     </select>
 
-    <sql id="sql">
-        er.id AS "id",
-        er.app AS "app",
-        er.role_name AS "roleName",
-        er.role_key AS "roleKey",
-        er.del_flag AS "delflag",
-        er.revision AS "revision",
-        er.created_by AS "createdby",
-        er.created_time AS "createdtime",
-        er.updated_by AS "updatedby",
-        er.updated_time AS "updatedtime"
-    </sql>
-
-    <select id="selectRoleByKey" parameterType="com.epmet.dto.RoleDTO" resultType="com.epmet.dto.RoleDTO">
-        SELECT
-        <include refid="sql"></include>
-        FROM epmet_role er
-        WHERE er.del_flag = '0'
-        AND er.app = #{app}
-        AND er.role_key = #{roleKey}
-    </select>
-
 </mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
index 78e05818a4..dc4a525517 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
@@ -16,33 +16,6 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <insert id="saveResiRole" parameterType="com.epmet.dto.UserRoleDTO">
-        INSERT INTO user_role (
-            id,
-            customer_id,
-            user_id,
-            role_id,
-            del_flag,
-            revision,
-            created_by,
-            created_time,
-            updated_by,
-            updated_time
-        )VALUES(
-            #{id},
-            #{customerId},
-            #{userId},
-            #{roleId},
-            #{delFlag},
-            #{revision},
-            #{createdBy},
-            #{createdTime},
-            #{updatedBy},
-            #{updatedTime}
-        )
-    </insert>
-
-
     <select id="getUserRoleInfo" parameterType="com.epmet.dto.form.UserRoleFormDTO"
             resultType="com.epmet.dto.result.UserRoleResultDTO">