ibiz4j 发布系统代码

app_web/src/locale/lanres/entities/sys-user-auth/sys-user-auth_en_US.ts

@@ -6,5 +6,6 @@ export default {
     identity_type: "认证类型",
     identifier: "认证标识",
     credential: "凭据",
+    username: "人员",
   },
 };
\ No newline at end of file

app_web/src/locale/lanres/entities/sys-user-auth/sys-user-auth_zh_CN.ts

@@ -5,5 +5,6 @@ export default {
     identity_type: "认证类型",
     identifier: "认证标识",
     credential: "凭据",
+    username: "人员",
   },
 };
\ No newline at end of file

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUserAuth.java

@@ -78,6 +78,13 @@ public class SysUserAuth extends EntityMP implements Serializable {
     @JSONField(name = "credential")
     @JsonProperty("credential")
     private String credential;
+    /**
+     * 人员
+     */
+    @TableField(exist = false)
+    @JSONField(name = "username")
+    @JsonProperty("username")
+    private String username;
 
     /**
      * 用户

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysUserAuthSearchContext.java

@@ -34,6 +34,20 @@ public class SysUserAuthSearchContext extends QueryWrapperContext<SysUserAuth> {
             this.getSearchCond().eq("userid", n_userid_eq);
         }
     }
+	private String n_username_eq;//[人员]
+	public void setN_username_eq(String n_username_eq) {
+        this.n_username_eq = n_username_eq;
+        if(!ObjectUtils.isEmpty(this.n_username_eq)){
+            this.getSearchCond().eq("username", n_username_eq);
+        }
+    }
+	private String n_username_like;//[人员]
+	public void setN_username_like(String n_username_like) {
+        this.n_username_like = n_username_like;
+        if(!ObjectUtils.isEmpty(this.n_username_like)){
+            this.getSearchCond().like("username", n_username_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysUserAuthServiceImpl.java

@@ -55,6 +55,7 @@ public class SysUserAuthServiceImpl extends ServiceImpl<SysUserAuthMapper, SysUs
     @Override
     @Transactional
     public boolean create(SysUserAuth et) {
+        fillParentData(et);
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
         CachedBeanCopier.copy(get(et.getId()),et);
@@ -63,12 +64,14 @@ public class SysUserAuthServiceImpl extends ServiceImpl<SysUserAuthMapper, SysUs
 
     @Override
     public void createBatch(List<SysUserAuth> list) {
+        list.forEach(item->fillParentData(item));
         this.saveOrUpdateBatch(list,batchSize);
     }
 
     @Override
     @Transactional
     public boolean update(SysUserAuth et) {
+        fillParentData(et);
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("authid",et.getId())))
             return false;
         CachedBeanCopier.copy(get(et.getId()),et);
@@ -77,6 +80,7 @@ public class SysUserAuthServiceImpl extends ServiceImpl<SysUserAuthMapper, SysUs
 
     @Override
     public void updateBatch(List<SysUserAuth> list) {
+        list.forEach(item->fillParentData(item));
         updateBatchById(list,batchSize);
     }
 
@@ -107,6 +111,7 @@ public class SysUserAuthServiceImpl extends ServiceImpl<SysUserAuthMapper, SysUs
 
     @Override
     public SysUserAuth getDraft(SysUserAuth et) {
+        fillParentData(et);
         return et;
     }
 
@@ -134,12 +139,14 @@ public class SysUserAuthServiceImpl extends ServiceImpl<SysUserAuthMapper, SysUs
 
     @Override
     public boolean saveBatch(Collection<SysUserAuth> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
         return true;
     }
 
     @Override
     public void saveBatch(List<SysUserAuth> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
     }
 
@@ -166,6 +173,22 @@ public class SysUserAuthServiceImpl extends ServiceImpl<SysUserAuthMapper, SysUs
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(SysUserAuth et){
+        //实体关系[DER1N_SYS_USER_AUTH_SYS_USER_USERID]
+        if(!ObjectUtils.isEmpty(et.getUserid())){
+            cn.ibizlab.core.uaa.domain.SysUser user=et.getUser();
+            if(ObjectUtils.isEmpty(user)){
+                cn.ibizlab.core.uaa.domain.SysUser majorEntity=sysuserService.get(et.getUserid());
+                et.setUser(majorEntity);
+                user=majorEntity;
+            }
+            et.setUsername(user.getUsername());
+        }
+    }
 
 
 

ibzuaa-core/src/main/resources/liquibase/h2_table.xml

@@ -146,7 +146,7 @@
 
 
     <!--输出实体[SYS_USER_AUTH]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_user_auth-8-7">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_user_auth-12-7">
         <createTable tableName="IBZUSERAUTH">
                 <column name="AUTHID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_USER_AUTH_AUTHID"/>

ibzuaa-core/src/main/resources/mapper/uaa/sysuserauth/SysUserAuthMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="SysUserAuthResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`AUTHID`, t1.`CREDENTIAL`, t1.`IDENTIFIER`, t1.`IDENTITY_TYPE`, t1.`USERID` FROM `IBZUSERAUTH` t1  ) t1 where authid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`AUTHID`, t1.`CREDENTIAL`, t1.`IDENTIFIER`, t1.`IDENTITY_TYPE`, t1.`USERID`, t11.`USERNAME` FROM `IBZUSERAUTH` t1  LEFT JOIN IBZUSER t11 ON t1.USERID = t11.USERID  ) t1 where authid=#{id}]]>
     </select>
 	<select id="selectById"  resultMap="SysUserAuthResultMap" databaseId="oracle">
         <![CDATA[select t1.* from (SELECT t1.AUTHID, t1.CREDENTIAL, t1.IDENTIFIER, t1.IDENTITY_TYPE, t1.USERID FROM IBZUSERAUTH t1  ) t1 where authid=#{id}]]>
@@ -44,7 +44,7 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`AUTHID`, t1.`CREDENTIAL`, t1.`IDENTIFIER`, t1.`IDENTITY_TYPE`, t1.`USERID` FROM `IBZUSERAUTH` t1  
+		<![CDATA[ SELECT t1.`AUTHID`, t1.`CREDENTIAL`, t1.`IDENTIFIER`, t1.`IDENTITY_TYPE`, t1.`USERID`, t11.`USERNAME` FROM `IBZUSERAUTH` t1  LEFT JOIN IBZUSER t11 ON t1.USERID = t11.USERID  
 			]]>
     </sql>
     <!--数据查询[Default]-->
@@ -59,7 +59,7 @@
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`AUTHID`, t1.`CREDENTIAL`, t1.`IDENTIFIER`, t1.`IDENTITY_TYPE`, t1.`USERID` FROM `IBZUSERAUTH` t1  
+		<![CDATA[ SELECT t1.`AUTHID`, t1.`CREDENTIAL`, t1.`IDENTIFIER`, t1.`IDENTITY_TYPE`, t1.`USERID`, t11.`USERNAME` FROM `IBZUSERAUTH` t1  LEFT JOIN IBZUSER t11 ON t1.USERID = t11.USERID  
 			]]>
     </sql>
     <!--数据查询[View]-->

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysUserAuthDTO.java

@@ -64,6 +64,14 @@ public class SysUserAuthDTO extends DTOBase implements Serializable {
     @JsonProperty("credential")
     private String credential;
 
+    /**
+     * 属性 [USERNAME]
+     *
+     */
+    @JSONField(name = "username")
+    @JsonProperty("username")
+    private String username;
+
 
     /**
      * 设置 [USERID]