update

cms/src/main/java/com/ym/mec/cms/dal/entity/SysNewsInformation.java

@@ -6,10 +6,12 @@ import java.util.Date;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(sys_news_information):
  */
-public class SysNewsInformation {
+public class SysNewsInformation extends BaseEntity {
 
 	/**  */
 	private Long id;
@@ -67,8 +69,6 @@ public class SysNewsInformation {
 
 	private Boolean delFlag;
 
-	private Integer tenantId;
-
 	private String attribute1;
 	
 	private String attribute2;
@@ -193,14 +193,6 @@ public class SysNewsInformation {
 		this.delFlag = delFlag;
 	}
 
-	public Integer getTenantId() {
-		return tenantId;
-	}
-
-	public void setTenantId(Integer tenantId) {
-		this.tenantId = tenantId;
-	}
-
 	public Integer getSubType() {
 		return subType;
 	}

cms/src/main/java/com/ym/mec/cms/dal/entity/SysNewsType.java

@@ -2,10 +2,12 @@ package com.ym.mec.cms.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(sys_news_type):
  */
-public class SysNewsType {
+public class SysNewsType extends BaseEntity {
 
 	/**  */
 	private Integer id;

cms/src/main/resources/config/mybatis/SysNewsTypeMapper.xml

@@ -10,6 +10,7 @@
 		<result column="del_flag_" property="delFlag" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 	
 	<resultMap type="com.ym.mec.cms.dal.entity.SysNewsTypeTree" extends="SysNewsType" id="SysNewsTypeTree">
@@ -31,8 +32,8 @@
 	<insert id="insert" parameterType="com.ym.mec.cms.dal.entity.SysNewsType"
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_news_type
-		(id_,name_,parent_id_,del_flag_,create_time_,update_time_)
-		VALUES(#{id},#{name},#{parentId},#{delFlag},#{createTime},#{updateTime})
+		(id_,name_,parent_id_,del_flag_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{name},#{parentId},#{delFlag},#{createTime},#{updateTime},#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -58,12 +59,12 @@
 				create_time_ = #{createTime},
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete">
-		DELETE FROM sys_news_type WHERE id_ = #{id}
+		DELETE FROM sys_news_type WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</delete>
 
 	<!-- 分页查询 -->

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysMenu.java

@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * 对应数据库表(sys_menu):
  */
-public class SysMenu extends BaseEntity {
+public class SysMenu {
 
 	/** 菜单ID */
 	@ApiModelProperty(value = "菜单ID",required = false)

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysRoleDept.java

@@ -1,54 +0,0 @@
-package com.ym.mec.auth.api.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import com.ym.mec.common.entity.BaseEntity;
-
-/**
- * 对应数据库表(sys_role_dept):
- */
-public class SysRoleDept extends BaseEntity {
-
-	/**  */
-	private Integer id;
-	
-	/** 角色ID */
-	@ApiModelProperty(value = "角色ID",required = false)
-	private Integer roleId;
-	
-	/** 部门ID */
-	@ApiModelProperty(value = "部门ID",required = false)
-	private Integer deptId;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setRoleId(Integer roleId){
-		this.roleId = roleId;
-	}
-	
-	public Integer getRoleId(){
-		return this.roleId;
-	}
-			
-	public void setDeptId(Integer deptId){
-		this.deptId = deptId;
-	}
-	
-	public Integer getDeptId(){
-		return this.deptId;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysRoleDeptDao.java

@@ -1,9 +0,0 @@
-package com.ym.mec.auth.dal.dao;
-
-import com.ym.mec.auth.api.entity.SysRoleDept;
-import com.ym.mec.common.dal.BaseDAO;
-
-public interface SysRoleDeptDao extends BaseDAO<Integer, SysRoleDept> {
-
-	
-}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysRoleDeptService.java

@@ -1,8 +0,0 @@
-package com.ym.mec.auth.service;
-
-import com.ym.mec.auth.api.entity.SysRoleDept;
-import com.ym.mec.common.service.BaseService;
-
-public interface SysRoleDeptService extends BaseService<Integer, SysRoleDept> {
-
-}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysRoleDeptServiceImpl.java

@@ -1,23 +0,0 @@
-package com.ym.mec.auth.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.ym.mec.auth.api.entity.SysRoleDept;
-import com.ym.mec.auth.dal.dao.SysRoleDeptDao;
-import com.ym.mec.auth.service.SysRoleDeptService;
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-
-@Service
-public class SysRoleDeptServiceImpl extends BaseServiceImpl<Integer, SysRoleDept>  implements SysRoleDeptService {
-	
-	@Autowired
-	private SysRoleDeptDao sysRoleDeptDao;
-
-	@Override
-	public BaseDAO<Integer, SysRoleDept> getDAO() {
-		return sysRoleDeptDao;
-	}
-	
-}

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysRoleDeptMapper.xml

@@ -1,63 +0,0 @@
-<?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.ym.mec.auth.dal.dao.SysRoleDeptDao">
-	
-	<resultMap type="com.ym.mec.auth.api.entity.SysRoleDept" id="SysRoleDept">
-		<result column="id_" property="id" />
-		<result column="role_id_" property="roleId" />
-		<result column="dept_id_" property="deptId" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="SysRoleDept" >
-		SELECT * FROM sys_role_dept WHERE id_ = #{id}
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="SysRoleDept">
-		SELECT * FROM sys_role_dept ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysRoleDept" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO sys_role_dept (id_,role_id_,dept_id_) VALUES(#{id},#{roleId},#{deptId})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysRoleDept">
-		UPDATE sys_role_dept
-		 <set>
-			 <if test="roleId != null">
-				 role_id_ = #{roleId},
-			 </if>
-			 <if test="deptId != null">
-				 dept_id_ = #{deptId},
-			 </if>
-		 </set>
-		 WHERE id_ = #{id}
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM sys_role_dept WHERE id_ = #{id}
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="SysRoleDept" parameterType="map">
-		SELECT * FROM sys_role_dept ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_role_dept
-	</select>
-</mapper>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserDeviceMapper.xml

@@ -14,6 +14,7 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="phone_" property="user.phone" />
 		<result column="real_name_" property="user.realName" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -24,7 +25,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysUserDevice">
-		SELECT * FROM sys_user_device
+		SELECT * FROM sys_user_device where tenant_id_ = #{tenantId}
 		ORDER BY id_
 	</select>
 
@@ -34,8 +35,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO sys_user_device
-		(id_,user_id_,device_num_,bind_time_,device_type_,client_id_,del_flag_)
-		VALUES(#{id},#{userId},#{deviceNum},#{bindTime},#{deviceType},#{clientId},0)
+		(id_,user_id_,device_num_,bind_time_,device_type_,client_id_,del_flag_,tenant_id_)
+		VALUES(#{id},#{userId},#{deviceNum},#{bindTime},#{deviceType},#{clientId},0,#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -65,7 +66,7 @@
 			</if>
 			update_time_ = now()
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -89,6 +90,9 @@
 		<if test="bindEndTime != null">
 			and date(bind_time_) &lt;= #{bindEndTime}
 		</if>
+		<if test="tenantId != null">
+			and ud.tenant_id_ = #{tenantId}
+		</if>
 		ORDER BY id_
 		<include refid="global.limit" />
 	</select>
@@ -109,17 +113,20 @@
 		<if test="bindEndTime != null">
 			and date(bind_time_) &lt;= #{bindEndTime}
 		</if>
+		<if test="tenantId != null">
+			and ud.tenant_id_ = #{tenantId}
+		</if>
 	</select>
 	
 	<select id="queryByUserId" resultMap="SysUserDevice" parameterType="map">
-		SELECT * FROM sys_user_device WHERE user_id_ = #{userId} and del_flag_ = 0
+		SELECT * FROM sys_user_device WHERE user_id_ = #{userId} and del_flag_ = 0 and tenant_id_ = #{tenantId}
 		<if test="clientId != null">
 			and client_id_ = #{clientId}
 		</if>
 	</select>
 	
 	<select id="queryByDeviceNum" resultMap="SysUserDevice" parameterType="map">
-		SELECT * FROM sys_user_device WHERE device_num_ = #{deviceNum} and del_flag_ = 0
+		SELECT * FROM sys_user_device WHERE device_num_ = #{deviceNum} and del_flag_ = 0 and tenant_id_ = #{tenantId}
 		<if test="clientId != null">
 			and client_id_ = #{clientId}
 		</if>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserLoginLogMapper.xml

@@ -8,6 +8,7 @@
 	
 	<resultMap type="com.ym.mec.auth.api.entity.SysUserLoginLog" id="SysUserLoginLog">
 		<result column="id_" property="id"/>
+        <result column="tenant_id_" property="tenantId"/>
 		<result column="user_id_" property="userId" />
 		<result column="login_ip_" property="loginIp" />
 		<result column="login_time_" property="loginTime" />
@@ -17,7 +18,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysUserLoginLog">
-		SELECT * FROM sys_user_login_log
+		SELECT * FROM sys_user_login_log where tenant_id_ = #{tenantId}
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -27,18 +28,18 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO sys_user_login_log (id_,user_id_,login_ip_,login_time_,source_) VALUES(#{id},#{userId},#{loginIp},#{loginTime},#{source})
+		INSERT INTO sys_user_login_log (id_,user_id_,login_ip_,login_time_,source_,tenant_id_) VALUES(#{id},#{userId},#{loginIp},#{loginTime},#{source},#{tenantId})
 	</insert>
 	
 	
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysUserLoginLog" parameterType="map">
-		SELECT * FROM sys_user_login_log <include refid="global.limit"/>
+		SELECT * FROM sys_user_login_log where tenant_id_ = #{tenantId} <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_user_login_log
+		SELECT COUNT(*) FROM sys_user_login_log where tenant_id_ = #{tenantId}
 	</select>
 </mapper>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserLoginMapper.xml

@@ -14,6 +14,7 @@
         <result column="fail_count_" property="failCount"/>
         <result column="lock_time_" property="lockTime"/>
         <result column="lock_date_" property="lockDate"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -35,8 +36,8 @@
         </selectKey>
         -->
         INSERT INTO sys_user_login
-        (user_id_,login_count_,last_login_time_,last_login_ip_,fail_count_,lock_time_,lock_date_)
-        VALUES(#{userId},#{loginCount},#{lastLoginTime},#{lastLoginIp},#{failCount},#{lockTime},#{lockDate})
+        (user_id_,login_count_,last_login_time_,last_login_ip_,fail_count_,lock_time_,lock_date_,tenant_id_)
+        VALUES(#{userId},#{loginCount},#{lastLoginTime},#{lastLoginIp},#{failCount},#{lockTime},#{lockDate},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -62,7 +63,7 @@
                 lock_date_ = #{lockDate},
             </if>
         </set>
-        WHERE user_id_ = #{userId}
+        WHERE user_id_ = #{userId} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -72,13 +73,13 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysUserLogin" parameterType="map">
-        SELECT * FROM sys_user_login ORDER BY user_id_
+        SELECT * FROM sys_user_login where tenant_id_ = #{tenantId} ORDER BY user_id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_user_login
+		SELECT COUNT(*) FROM sys_user_login where tenant_id_ = #{tenantId}
 	</select>
 
     <select id="findLoginByUserId" resultMap="SysUserLogin">

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -51,6 +51,9 @@
         <if test="organId != null">
             and organ_id_ = #{organId}
         </if>
+        <if test="tenantId != null">
+            and tenant_id_ = #{tenantId}
+        </if>
     </sql>
 
     <!-- 根据主键查询一条记录 -->
@@ -62,7 +65,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysUser">
-		SELECT * FROM sys_user ORDER BY id_
+		SELECT * FROM sys_user where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -91,9 +94,6 @@
     <update id="update" parameterType="com.ym.mec.auth.api.entity.SysUser">
         UPDATE sys_user
         <set>
-            <if test="tenantId != null">
-                tenant_id_ = #{tenantId},
-            </if>
             <if test="delFlag != null">
                 del_flag_ = #{delFlag, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
@@ -161,7 +161,7 @@
                 certificate_type_ = #{certificateType},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
     <update id="updatePassword">
         UPDATE sys_user SET password_ = #{password} WHERE phone_ = #{mobile}
@@ -177,7 +177,7 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysUser" parameterType="map">
-        SELECT * FROM sys_user ORDER BY id_
+        SELECT * FROM sys_user
         <include refid="queryCondition"/>
         <include refid="global.orderby"/>
         <include refid="global.limit"/>
@@ -211,7 +211,7 @@
     </select>
     
     <select id="queryByStatus" resultMap="SysUser">
-        select * from sys_user where lock_flag_ = #{status}
+        select * from sys_user where lock_flag_ = #{status} and tenant_id_ = #{tenantId}
     </select>
     <select id="findUserBySalt" resultMap="SysUser">
         SELECT * FROM sys_user WHERE salt_ IS NOT NULL AND salt_ = 'replace' AND user_type_ LIKE CONCAT('%',#{userType},'%') LIMIT 1

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserRoleMapper.xml

@@ -9,6 +9,7 @@
     <resultMap type="com.ym.mec.auth.api.entity.SysUserRole" id="SysUserRole">
         <result column="user_id_" property="userId"/>
         <result column="role_id_" property="roleId"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -18,7 +19,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysUserRole">
-		SELECT * FROM sys_user_role ORDER BY user_id_,role_id_
+		SELECT * FROM sys_user_role where tenant_id_ = #{tenantId} ORDER BY user_id_,role_id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->