adsc标识

data-center-business-controller/src/main/resources/db/migration/V72__adsc_flag.sql

@@ -0,0 +1,26 @@
+USE `data_center_aeon_admin`;
+
+DROP PROCEDURE IF EXISTS `add_user_name_column`;
+
+DELIMITER $$
+
+CREATE PROCEDURE add_user_name_column()
+BEGIN
+    -- 姓
+    IF NOT EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_schema = 'data_center_aeon_admin'
+          AND table_name = 'basic_user'
+          AND column_name = 'adsc_flag'
+    ) THEN
+        ALTER TABLE basic_user
+            ADD COLUMN `adsc_flag` INT DEFAULT '0' COMMENT 'adsc标识, 0-不是, 1-是';
+    END IF;
+END$$
+
+DELIMITER ;
+
+CALL add_user_name_column();
+
+DROP PROCEDURE IF EXISTS `add_user_name_column`;

data-center-business-dao/src/main/resources/mappers/auto/BasicUserMapper.xml

@@ -25,6 +25,10 @@
     <result column="modify_time" jdbcType="BIGINT" property="modifyTime" />
     <result column="modifier_id" jdbcType="BIGINT" property="modifierId" />
     <result column="super_role" jdbcType="INTEGER" property="superRole" />
+    <result column="create_platform" jdbcType="INTEGER" property="createPlatform" />
+    <result column="last_name" jdbcType="VARCHAR" property="lastName" />
+    <result column="first_name" jdbcType="VARCHAR" property="firstName" />
+    <result column="adsc_flag" jdbcType="INTEGER" property="adscFlag" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -99,7 +103,7 @@
     -->
     id, user_type, company_id, username, login_name, `password`, salt, email, mfa_secret, 
     mfa_bind, mobile_number, last_login_time, flag, expire_time, create_time, creator_id, 
-    modify_time, modifier_id, super_role
+    modify_time, modifier_id, super_role, create_platform, last_name, first_name, adsc_flag
   </sql>
   <select id="selectByExample" parameterType="com.techsor.datacenter.business.model.BasicUserExample" resultMap="BaseResultMap">
     <!--
@@ -161,15 +165,17 @@
       email, mfa_secret, mfa_bind, 
       mobile_number, last_login_time, flag, 
       expire_time, create_time, creator_id, 
-      modify_time, modifier_id, super_role
-      )
+      modify_time, modifier_id, super_role, 
+      create_platform, last_name, first_name, 
+      adsc_flag)
     values (#{userType,jdbcType=INTEGER}, #{companyId,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, 
       #{loginName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{salt,jdbcType=VARCHAR}, 
       #{email,jdbcType=VARCHAR}, #{mfaSecret,jdbcType=VARCHAR}, #{mfaBind,jdbcType=INTEGER}, 
       #{mobileNumber,jdbcType=VARCHAR}, #{lastLoginTime,jdbcType=BIGINT}, #{flag,jdbcType=INTEGER}, 
       #{expireTime,jdbcType=BIGINT}, #{createTime,jdbcType=BIGINT}, #{creatorId,jdbcType=BIGINT}, 
-      #{modifyTime,jdbcType=BIGINT}, #{modifierId,jdbcType=BIGINT}, #{superRole,jdbcType=INTEGER}
-      )
+      #{modifyTime,jdbcType=BIGINT}, #{modifierId,jdbcType=BIGINT}, #{superRole,jdbcType=INTEGER}, 
+      #{createPlatform,jdbcType=INTEGER}, #{lastName,jdbcType=VARCHAR}, #{firstName,jdbcType=VARCHAR}, 
+      #{adscFlag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.techsor.datacenter.business.model.BasicUser">
     <!--
@@ -235,6 +241,18 @@
       <if test="superRole != null">
         super_role,
       </if>
+      <if test="createPlatform != null">
+        create_platform,
+      </if>
+      <if test="lastName != null">
+        last_name,
+      </if>
+      <if test="firstName != null">
+        first_name,
+      </if>
+      <if test="adscFlag != null">
+        adsc_flag,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="userType != null">
@@ -291,6 +309,18 @@
       <if test="superRole != null">
         #{superRole,jdbcType=INTEGER},
       </if>
+      <if test="createPlatform != null">
+        #{createPlatform,jdbcType=INTEGER},
+      </if>
+      <if test="lastName != null">
+        #{lastName,jdbcType=VARCHAR},
+      </if>
+      <if test="firstName != null">
+        #{firstName,jdbcType=VARCHAR},
+      </if>
+      <if test="adscFlag != null">
+        #{adscFlag,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.techsor.datacenter.business.model.BasicUserExample" resultType="java.lang.Long">
@@ -367,6 +397,18 @@
       <if test="record.superRole != null">
         super_role = #{record.superRole,jdbcType=INTEGER},
       </if>
+      <if test="record.createPlatform != null">
+        create_platform = #{record.createPlatform,jdbcType=INTEGER},
+      </if>
+      <if test="record.lastName != null">
+        last_name = #{record.lastName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.firstName != null">
+        first_name = #{record.firstName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adscFlag != null">
+        adsc_flag = #{record.adscFlag,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -396,7 +438,11 @@
       creator_id = #{record.creatorId,jdbcType=BIGINT},
       modify_time = #{record.modifyTime,jdbcType=BIGINT},
       modifier_id = #{record.modifierId,jdbcType=BIGINT},
-      super_role = #{record.superRole,jdbcType=INTEGER}
+      super_role = #{record.superRole,jdbcType=INTEGER},
+      create_platform = #{record.createPlatform,jdbcType=INTEGER},
+      last_name = #{record.lastName,jdbcType=VARCHAR},
+      first_name = #{record.firstName,jdbcType=VARCHAR},
+      adsc_flag = #{record.adscFlag,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -462,6 +508,18 @@
       <if test="superRole != null">
         super_role = #{superRole,jdbcType=INTEGER},
       </if>
+      <if test="createPlatform != null">
+        create_platform = #{createPlatform,jdbcType=INTEGER},
+      </if>
+      <if test="lastName != null">
+        last_name = #{lastName,jdbcType=VARCHAR},
+      </if>
+      <if test="firstName != null">
+        first_name = #{firstName,jdbcType=VARCHAR},
+      </if>
+      <if test="adscFlag != null">
+        adsc_flag = #{adscFlag,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -488,7 +546,11 @@
       creator_id = #{creatorId,jdbcType=BIGINT},
       modify_time = #{modifyTime,jdbcType=BIGINT},
       modifier_id = #{modifierId,jdbcType=BIGINT},
-      super_role = #{superRole,jdbcType=INTEGER}
+      super_role = #{superRole,jdbcType=INTEGER},
+      create_platform = #{createPlatform,jdbcType=INTEGER},
+      last_name = #{lastName,jdbcType=VARCHAR},
+      first_name = #{firstName,jdbcType=VARCHAR},
+      adsc_flag = #{adscFlag,jdbcType=INTEGER}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

data-center-business-dao/src/main/resources/mappers/ex/BasicUserMapperExt.xml

@@ -23,7 +23,8 @@
 	    	bcom.mfa_switch,
 	    	bcom.lock_switch,
 	    	buser.mfa_bind,
-	    	buser.super_role
+	    	buser.super_role,
+			buser.adsc_flag
 	    from data_center_aeon_admin.basic_user buser
 	    inner join data_center_aeon_admin.basic_company bcom on bcom.id = buser.company_id
 	    	WHERE buser.flag != 1 and buser.user_type = 2 and bcom.flag != 1 and (login_name = #{loginname}) 

data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/account/CacheUserData.java

@@ -27,4 +27,6 @@ public class CacheUserData {
 
 	@Schema(description ="Under the premise of the enterprise enabling MFA service, whether the user has bound an MFA device, 0-not bound, 1-bound. If bound, MFA cannot be skipped; if not bound, MFA can be skipped.", example = "1")
 	private Integer mfaBind;
+
+	private Integer adscFlag;
 }

data-center-business-model/src/main/java/com/techsor/datacenter/business/model/BasicUser.java

@@ -174,6 +174,42 @@ public class BasicUser implements Serializable {
      */
     private Integer superRole;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column basic_user.create_platform
+     *
+     * @mbg.generated
+     */
+    private Integer createPlatform;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column basic_user.last_name
+     *
+     * @mbg.generated
+     */
+    private String lastName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column basic_user.first_name
+     *
+     * @mbg.generated
+     */
+    private String firstName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column basic_user.adsc_flag
+     *
+     * @mbg.generated
+     */
+    private Integer adscFlag;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table basic_user
@@ -638,6 +674,102 @@ public class BasicUser implements Serializable {
         this.superRole = superRole;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column basic_user.create_platform
+     *
+     * @return the value of basic_user.create_platform
+     *
+     * @mbg.generated
+     */
+    public Integer getCreatePlatform() {
+        return createPlatform;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column basic_user.create_platform
+     *
+     * @param createPlatform the value for basic_user.create_platform
+     *
+     * @mbg.generated
+     */
+    public void setCreatePlatform(Integer createPlatform) {
+        this.createPlatform = createPlatform;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column basic_user.last_name
+     *
+     * @return the value of basic_user.last_name
+     *
+     * @mbg.generated
+     */
+    public String getLastName() {
+        return lastName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column basic_user.last_name
+     *
+     * @param lastName the value for basic_user.last_name
+     *
+     * @mbg.generated
+     */
+    public void setLastName(String lastName) {
+        this.lastName = lastName == null ? null : lastName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column basic_user.first_name
+     *
+     * @return the value of basic_user.first_name
+     *
+     * @mbg.generated
+     */
+    public String getFirstName() {
+        return firstName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column basic_user.first_name
+     *
+     * @param firstName the value for basic_user.first_name
+     *
+     * @mbg.generated
+     */
+    public void setFirstName(String firstName) {
+        this.firstName = firstName == null ? null : firstName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column basic_user.adsc_flag
+     *
+     * @return the value of basic_user.adsc_flag
+     *
+     * @mbg.generated
+     */
+    public Integer getAdscFlag() {
+        return adscFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column basic_user.adsc_flag
+     *
+     * @param adscFlag the value for basic_user.adsc_flag
+     *
+     * @mbg.generated
+     */
+    public void setAdscFlag(Integer adscFlag) {
+        this.adscFlag = adscFlag;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table basic_user
@@ -669,6 +801,10 @@ public class BasicUser implements Serializable {
         sb.append(", modifyTime=").append(modifyTime);
         sb.append(", modifierId=").append(modifierId);
         sb.append(", superRole=").append(superRole);
+        sb.append(", createPlatform=").append(createPlatform);
+        sb.append(", lastName=").append(lastName);
+        sb.append(", firstName=").append(firstName);
+        sb.append(", adscFlag=").append(adscFlag);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

data-center-business-model/src/main/java/com/techsor/datacenter/business/model/BasicUserExample.java

@@ -1403,6 +1403,266 @@ public class BasicUserExample {
             addCriterion("super_role not between", value1, value2, "superRole");
             return (Criteria) this;
         }
+
+        public Criteria andCreatePlatformIsNull() {
+            addCriterion("create_platform is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatePlatformIsNotNull() {
+            addCriterion("create_platform is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatePlatformEqualTo(Integer value) {
+            addCriterion("create_platform =", value, "createPlatform");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatePlatformNotEqualTo(Integer value) {
+            addCriterion("create_platform <>", value, "createPlatform");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatePlatformGreaterThan(Integer value) {
+            addCriterion("create_platform >", value, "createPlatform");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatePlatformGreaterThanOrEqualTo(Integer value) {
+            addCriterion("create_platform >=", value, "createPlatform");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatePlatformLessThan(Integer value) {
+            addCriterion("create_platform <", value, "createPlatform");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatePlatformLessThanOrEqualTo(Integer value) {
+            addCriterion("create_platform <=", value, "createPlatform");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatePlatformIn(List<Integer> values) {
+            addCriterion("create_platform in", values, "createPlatform");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatePlatformNotIn(List<Integer> values) {
+            addCriterion("create_platform not in", values, "createPlatform");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatePlatformBetween(Integer value1, Integer value2) {
+            addCriterion("create_platform between", value1, value2, "createPlatform");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatePlatformNotBetween(Integer value1, Integer value2) {
+            addCriterion("create_platform not between", value1, value2, "createPlatform");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameIsNull() {
+            addCriterion("last_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameIsNotNull() {
+            addCriterion("last_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameEqualTo(String value) {
+            addCriterion("last_name =", value, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameNotEqualTo(String value) {
+            addCriterion("last_name <>", value, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameGreaterThan(String value) {
+            addCriterion("last_name >", value, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameGreaterThanOrEqualTo(String value) {
+            addCriterion("last_name >=", value, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameLessThan(String value) {
+            addCriterion("last_name <", value, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameLessThanOrEqualTo(String value) {
+            addCriterion("last_name <=", value, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameLike(String value) {
+            addCriterion("last_name like", value, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameNotLike(String value) {
+            addCriterion("last_name not like", value, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameIn(List<String> values) {
+            addCriterion("last_name in", values, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameNotIn(List<String> values) {
+            addCriterion("last_name not in", values, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameBetween(String value1, String value2) {
+            addCriterion("last_name between", value1, value2, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameNotBetween(String value1, String value2) {
+            addCriterion("last_name not between", value1, value2, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameIsNull() {
+            addCriterion("first_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameIsNotNull() {
+            addCriterion("first_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameEqualTo(String value) {
+            addCriterion("first_name =", value, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameNotEqualTo(String value) {
+            addCriterion("first_name <>", value, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameGreaterThan(String value) {
+            addCriterion("first_name >", value, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameGreaterThanOrEqualTo(String value) {
+            addCriterion("first_name >=", value, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameLessThan(String value) {
+            addCriterion("first_name <", value, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameLessThanOrEqualTo(String value) {
+            addCriterion("first_name <=", value, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameLike(String value) {
+            addCriterion("first_name like", value, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameNotLike(String value) {
+            addCriterion("first_name not like", value, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameIn(List<String> values) {
+            addCriterion("first_name in", values, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameNotIn(List<String> values) {
+            addCriterion("first_name not in", values, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameBetween(String value1, String value2) {
+            addCriterion("first_name between", value1, value2, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameNotBetween(String value1, String value2) {
+            addCriterion("first_name not between", value1, value2, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdscFlagIsNull() {
+            addCriterion("adsc_flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdscFlagIsNotNull() {
+            addCriterion("adsc_flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdscFlagEqualTo(Integer value) {
+            addCriterion("adsc_flag =", value, "adscFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdscFlagNotEqualTo(Integer value) {
+            addCriterion("adsc_flag <>", value, "adscFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdscFlagGreaterThan(Integer value) {
+            addCriterion("adsc_flag >", value, "adscFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdscFlagGreaterThanOrEqualTo(Integer value) {
+            addCriterion("adsc_flag >=", value, "adscFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdscFlagLessThan(Integer value) {
+            addCriterion("adsc_flag <", value, "adscFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdscFlagLessThanOrEqualTo(Integer value) {
+            addCriterion("adsc_flag <=", value, "adscFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdscFlagIn(List<Integer> values) {
+            addCriterion("adsc_flag in", values, "adscFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdscFlagNotIn(List<Integer> values) {
+            addCriterion("adsc_flag not in", values, "adscFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdscFlagBetween(Integer value1, Integer value2) {
+            addCriterion("adsc_flag between", value1, value2, "adscFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdscFlagNotBetween(Integer value1, Integer value2) {
+            addCriterion("adsc_flag not between", value1, value2, "adscFlag");
+            return (Criteria) this;
+        }
     }
 
     /**

data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/AccountServiceImpl.java

@@ -184,6 +184,7 @@ public class AccountServiceImpl implements AccountService {
 					cacheUserData.setMfaSwitch(userInfoVO.getMfaSwitch());
 					cacheUserData.setMfaBind(userInfoVO.getMfaBind());
 					cacheUserData.setEmail(userInfoVO.getEmail());
+					cacheUserData.setAdscFlag(userInfoVO.getAdscFlag());
 
 
 					if (null != targetPlatform && 2 == targetPlatform) {