ibiz4j 发布系统代码

ibzrt-app/ibzrt-app-web/src/main/resources/application-web-prod.yml

@@ -41,7 +41,7 @@ zuul:
       stripPrefix: false
     sys_emp:
       path: /sysemployees/**
-      serviceId: ${ibiz.ref.service.ibzrt-api:ibzrt-api}
+      serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
       stripPrefix: false
     sys_team:
       path: /systeams/**

ibzrt-boot/src/main/resources/application-dev.yml

@@ -48,6 +48,10 @@ zuul:
         path: /sys_deptmembers/**
         serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
         stripPrefix: false
+      sys_emp:
+        path: /sys_emps/**
+        serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
+        stripPrefix: false
       sys_open_access:
         path: /sys_open_accesses/**
         serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}

ibzrt-core/src/main/java/cn/ibizlab/core/extensions/service/SysEmployeeExService.java

@@ -16,10 +16,6 @@ import java.util.*;
 @Service("SysEmployeeExService")
 public class SysEmployeeExService extends SysEmployeeServiceImpl {
 
-    @Override
-    protected Class currentModelClass() {
-        return com.baomidou.mybatisplus.core.toolkit.ReflectionKit.getSuperClassGenericType(this.getClass().getSuperclass(), 1);
-    }
 
     /**
      * 自定义行为[InitPwd]用户扩展

ibzrt-core/src/main/java/cn/ibizlab/core/ou/domain/SysEmployee.java

@@ -23,313 +23,300 @@ import lombok.*;
 import org.springframework.data.annotation.Transient;
 import cn.ibizlab.util.annotation.Audit;
 
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.baomidou.mybatisplus.annotation.*;
-import cn.ibizlab.util.domain.EntityMP;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import cn.ibizlab.util.domain.EntityClient;
 
 /**
- * 实体[人员]
+ * ServiceApi [人员] 对象
  */
-@Getter
-@Setter
-@NoArgsConstructor
-@JsonIgnoreProperties(value = "handler")
-@TableName(value = "IBZEMP",resultMap = "SysEmployeeResultMap")
-public class SysEmployee extends EntityMP implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+@Data
+public class SysEmployee extends EntityClient implements Serializable {
 
     /**
      * 用户标识
      */
     @DEField(isKeyField=true)
-    @TableId(value= "userid",type=IdType.ASSIGN_UUID)
     @JSONField(name = "userid")
     @JsonProperty("userid")
     private String userid;
+
     /**
      * 用户全局名
      */
-    @TableField(value = "username")
     @JSONField(name = "username")
     @JsonProperty("username")
     private String username;
+
     /**
      * 姓名
      */
-    @TableField(value = "personname")
     @JSONField(name = "personname")
     @JsonProperty("personname")
     private String personname;
+
     /**
      * 用户工号
      */
-    @TableField(value = "usercode")
     @JSONField(name = "usercode")
     @JsonProperty("usercode")
     private String usercode;
+
     /**
      * 登录名
      */
-    @TableField(value = "loginname")
     @JSONField(name = "loginname")
     @JsonProperty("loginname")
     private String loginname;
+
     /**
      * 密码
      */
-    @TableField(value = "password")
     @JSONField(name = "password")
     @JsonProperty("password")
     private String password;
+
     /**
      * 区属
      */
-    @TableField(value = "domains")
     @JSONField(name = "domains")
     @JsonProperty("domains")
     private String domains;
+
     /**
      * 主部门
      */
-    @TableField(value = "mdeptid")
     @JSONField(name = "mdeptid")
     @JsonProperty("mdeptid")
     private String mdeptid;
+
     /**
      * 主部门代码
      */
-    @TableField(value = "mdeptcode")
     @JSONField(name = "mdeptcode")
     @JsonProperty("mdeptcode")
     private String mdeptcode;
+
     /**
      * 主部门名称
      */
-    @TableField(value = "mdeptname")
     @JSONField(name = "mdeptname")
     @JsonProperty("mdeptname")
     private String mdeptname;
+
     /**
      * 业务编码
      */
-    @TableField(value = "bcode")
     @JSONField(name = "bcode")
     @JsonProperty("bcode")
     private String bcode;
+
     /**
      * 岗位标识
      */
-    @TableField(value = "postid")
     @JSONField(name = "postid")
     @JsonProperty("postid")
     private String postid;
+
     /**
      * 岗位代码
      */
-    @TableField(value = "postcode")
     @JSONField(name = "postcode")
     @JsonProperty("postcode")
     private String postcode;
+
     /**
      * 岗位名称
      */
-    @TableField(value = "postname")
     @JSONField(name = "postname")
     @JsonProperty("postname")
     private String postname;
+
     /**
      * 单位
      */
     @DEField(preType = DEPredefinedFieldType.ORGID)
-    @TableField(value = "orgid")
     @JSONField(name = "orgid")
     @JsonProperty("orgid")
     private String orgid;
+
     /**
      * 单位代码
      */
-    @TableField(value = "orgcode")
     @JSONField(name = "orgcode")
     @JsonProperty("orgcode")
     private String orgcode;
+
     /**
      * 单位名称
      */
     @DEField(preType = DEPredefinedFieldType.ORGNAME)
-    @TableField(value = "orgname")
     @JSONField(name = "orgname")
     @JsonProperty("orgname")
     private String orgname;
+
     /**
      * 昵称别名
      */
-    @TableField(value = "nickname")
     @JSONField(name = "nickname")
     @JsonProperty("nickname")
     private String nickname;
+
     /**
      * 性别
      */
-    @TableField(value = "sex")
     @JSONField(name = "sex")
     @JsonProperty("sex")
     private String sex;
+
     /**
      * 证件号码
      */
-    @TableField(value = "certcode")
     @JSONField(name = "certcode")
     @JsonProperty("certcode")
     private String certcode;
+
     /**
      * 联系方式
      */
-    @TableField(value = "phone")
     @JSONField(name = "phone")
     @JsonProperty("phone")
     private String phone;
+
     /**
      * 出生日期
      */
-    @TableField(value = "birthday")
     @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "birthday" , format="yyyy-MM-dd")
     @JsonProperty("birthday")
     private Timestamp birthday;
+
     /**
      * 邮件
      */
-    @TableField(value = "email")
     @JSONField(name = "email")
     @JsonProperty("email")
     private String email;
+
     /**
      * 社交账号
      */
-    @TableField(value = "avatar")
     @JSONField(name = "avatar")
     @JsonProperty("avatar")
     private String avatar;
+
     /**
      * 地址
      */
-    @TableField(value = "addr")
     @JSONField(name = "addr")
     @JsonProperty("addr")
     private String addr;
+
     /**
      * 照片
      */
-    @TableField(value = "usericon")
     @JSONField(name = "usericon")
     @JsonProperty("usericon")
     private String usericon;
+
     /**
      * ip地址
      */
-    @TableField(value = "ipaddr")
     @JSONField(name = "ipaddr")
     @JsonProperty("ipaddr")
     private String ipaddr;
+
     /**
      * 样式
      */
-    @TableField(value = "theme")
     @JSONField(name = "theme")
     @JsonProperty("theme")
     private String theme;
+
     /**
      * 语言
      */
-    @TableField(value = "lang")
     @JSONField(name = "lang")
     @JsonProperty("lang")
     private String lang;
+
     /**
      * 字号
      */
-    @TableField(value = "fontsize")
     @JSONField(name = "fontsize")
     @JsonProperty("fontsize")
     private String fontsize;
+
     /**
      * 备注
      */
-    @TableField(value = "memo")
     @JSONField(name = "memo")
     @JsonProperty("memo")
     private String memo;
+
     /**
      * 保留
      */
-    @TableField(value = "reserver")
     @JSONField(name = "reserver")
     @JsonProperty("reserver")
     private String reserver;
+
     /**
      * 排序
      */
-    @TableField(value = "showorder")
     @JSONField(name = "showorder")
     @JsonProperty("showorder")
     private Integer showorder;
+
     /**
      * 逻辑有效
      */
     @DEField(preType = DEPredefinedFieldType.LOGICVALID, logicval = "1" , logicdelval="0")
-    @TableLogic(value= "1",delval="0")
-    @TableField(value = "enable")
     @JSONField(name = "enable")
     @JsonProperty("enable")
     private Integer enable;
+
     /**
      * 创建时间
      */
     @DEField(preType = DEPredefinedFieldType.CREATEDATE)
-    @TableField(value = "createdate" , fill = FieldFill.INSERT)
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("createdate")
     private Timestamp createdate;
+
     /**
      * 最后修改时间
      */
     @DEField(preType = DEPredefinedFieldType.UPDATEDATE)
-    @TableField(value = "updatedate")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
     private Timestamp updatedate;
 
+
     /**
      * 
      */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
+    @JSONField(name = "maindept")
+    @JsonProperty("maindept")
     private cn.ibizlab.core.ou.domain.SysDepartment maindept;
 
     /**
      * 
      */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
+    @JSONField(name = "org")
+    @JsonProperty("org")
     private cn.ibizlab.core.ou.domain.SysOrganization org;
 
     /**
      * 
      */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
+    @JSONField(name = "post")
+    @JsonProperty("post")
     private cn.ibizlab.core.ou.domain.SysPost post;
 
 
 
+
     /**
      * 设置 [用户全局名]
      */
@@ -580,7 +567,6 @@ public class SysEmployee extends EntityMP implements Serializable {
         this.modify("showorder",showorder);
     }
 
-
     /**
      * 复制当前对象数据到目标对象(粘贴重置)
      * @param targetEntity 目标数据对象

ibzrt-core/src/main/java/cn/ibizlab/core/ou/filter/SysEmployeeSearchContext.java

@@ -17,107 +17,36 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 
-import cn.ibizlab.util.filter.QueryWrapperContext;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import cn.ibizlab.core.ou.domain.SysEmployee;
+import cn.ibizlab.util.filter.SearchContextBase;
+
 /**
- * 关系型数据实体[SysEmployee] 查询条件对象
+ * ServiceApi数据实体[SysEmployee] 查询条件对象
  */
 @Slf4j
 @Data
-public class SysEmployeeSearchContext extends QueryWrapperContext<SysEmployee> {
-
+public class SysEmployeeSearchContext extends SearchContextBase {
 	private String n_personname_like;//[姓名]
-	public void setN_personname_like(String n_personname_like) {
-        this.n_personname_like = n_personname_like;
-        if(!ObjectUtils.isEmpty(this.n_personname_like)){
-            this.getSearchCond().like("personname", n_personname_like);
-        }
-    }
+
 	private String n_usercode_like;//[用户工号]
-	public void setN_usercode_like(String n_usercode_like) {
-        this.n_usercode_like = n_usercode_like;
-        if(!ObjectUtils.isEmpty(this.n_usercode_like)){
-            this.getSearchCond().like("usercode", n_usercode_like);
-        }
-    }
+
 	private String n_mdeptid_eq;//[主部门]
-	public void setN_mdeptid_eq(String n_mdeptid_eq) {
-        this.n_mdeptid_eq = n_mdeptid_eq;
-        if(!ObjectUtils.isEmpty(this.n_mdeptid_eq)){
-            this.getSearchCond().eq("mdeptid", n_mdeptid_eq);
-        }
-    }
+
 	private String n_mdeptname_like;//[主部门名称]
-	public void setN_mdeptname_like(String n_mdeptname_like) {
-        this.n_mdeptname_like = n_mdeptname_like;
-        if(!ObjectUtils.isEmpty(this.n_mdeptname_like)){
-            this.getSearchCond().like("mdeptname", n_mdeptname_like);
-        }
-    }
+
 	private String n_bcode_like;//[业务编码]
-	public void setN_bcode_like(String n_bcode_like) {
-        this.n_bcode_like = n_bcode_like;
-        if(!ObjectUtils.isEmpty(this.n_bcode_like)){
-            this.getSearchCond().like("bcode", n_bcode_like);
-        }
-    }
+
 	private String n_postid_eq;//[岗位标识]
-	public void setN_postid_eq(String n_postid_eq) {
-        this.n_postid_eq = n_postid_eq;
-        if(!ObjectUtils.isEmpty(this.n_postid_eq)){
-            this.getSearchCond().eq("postid", n_postid_eq);
-        }
-    }
+
 	private String n_postname_eq;//[岗位名称]
-	public void setN_postname_eq(String n_postname_eq) {
-        this.n_postname_eq = n_postname_eq;
-        if(!ObjectUtils.isEmpty(this.n_postname_eq)){
-            this.getSearchCond().eq("postname", n_postname_eq);
-        }
-    }
+
 	private String n_postname_like;//[岗位名称]
-	public void setN_postname_like(String n_postname_like) {
-        this.n_postname_like = n_postname_like;
-        if(!ObjectUtils.isEmpty(this.n_postname_like)){
-            this.getSearchCond().like("postname", n_postname_like);
-        }
-    }
+
 	private String n_orgid_eq;//[单位]
-	public void setN_orgid_eq(String n_orgid_eq) {
-        this.n_orgid_eq = n_orgid_eq;
-        if(!ObjectUtils.isEmpty(this.n_orgid_eq)){
-            this.getSearchCond().eq("orgid", n_orgid_eq);
-        }
-    }
+
 	private String n_orgcode_leftlike;//[单位代码]
-	public void setN_orgcode_leftlike(String n_orgcode_leftlike) {
-        this.n_orgcode_leftlike = n_orgcode_leftlike;
-        if(!ObjectUtils.isEmpty(this.n_orgcode_leftlike)){
-            this.getSearchCond().likeRight("orgcode", n_orgcode_leftlike);
-        }
-    }
+
 	private String n_sex_eq;//[性别]
-	public void setN_sex_eq(String n_sex_eq) {
-        this.n_sex_eq = n_sex_eq;
-        if(!ObjectUtils.isEmpty(this.n_sex_eq)){
-            this.getSearchCond().eq("sex", n_sex_eq);
-        }
-    }
-
-    /**
-	 * 启用快速搜索
-	 */
-	public void setQuery(String query)
-	{
-		 this.query=query;
-		 if(!StringUtils.isEmpty(query)){
-            this.getSearchCond().and( wrapper ->
-                     wrapper.like("personname", query)   
-            );
-		 }
-	}
-}
 
+}
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/ISysEmployeeService.java

@@ -19,12 +19,10 @@ import cn.ibizlab.core.ou.domain.SysEmployee;
 import cn.ibizlab.core.ou.filter.SysEmployeeSearchContext;
 
 
-import com.baomidou.mybatisplus.extension.service.IService;
-
 /**
  * 实体[SysEmployee] 服务对象接口
  */
-public interface ISysEmployeeService extends IService<SysEmployee>{
+public interface ISysEmployeeService{
 
     boolean create(SysEmployee et) ;
     @CacheEvict(value="sysemployee",allEntries=true)
@@ -52,23 +50,8 @@ public interface ISysEmployeeService extends IService<SysEmployee>{
     List<SysEmployee> selectByPostid(String postid) ;
     @CacheEvict(value="sysemployee",allEntries=true)
     void removeByPostid(String postid) ;
-    /**
-     *自定义查询SQL
-     * @param sql  select * from table where id =#{et.param}
-     * @param param 参数列表  param.put("param","1");
-     * @return select * from table where id = '1'
-     */
-    List<JSONObject> select(String sql, Map param);
-    /**
-     *自定义SQL
-     * @param sql  update table  set name ='test' where id =#{et.param}
-     * @param param 参数列表  param.put("param","1");
-     * @return     update table  set name ='test' where id = '1'
-     */
-    boolean execute(String sql, Map param);
 
-    List<SysEmployee> getSysemployeeByIds(List<String> ids) ;
-    List<SysEmployee> getSysemployeeByEntities(List<SysEmployee> entities) ;
 }
 
 
+

ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysDepartmentServiceImpl.java

@@ -45,9 +45,6 @@ public class SysDepartmentServiceImpl implements ISysDepartmentService {
     @Autowired
     SysDepartmentFeignClient sysDepartmentFeignClient;
 
-    @Autowired
-    @Lazy
-    protected cn.ibizlab.core.ou.service.ISysEmployeeService sysemployeeService;
 
     @Override
     public boolean create(SysDepartment et) {

ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysOrganizationServiceImpl.java

@@ -45,9 +45,6 @@ public class SysOrganizationServiceImpl implements ISysOrganizationService {
     @Autowired
     SysOrganizationFeignClient sysOrganizationFeignClient;
 
-    @Autowired
-    @Lazy
-    protected cn.ibizlab.core.ou.service.ISysEmployeeService sysemployeeService;
 
     @Override
     public boolean create(SysOrganization et) {

ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysPostServiceImpl.java

@@ -45,9 +45,6 @@ public class SysPostServiceImpl implements ISysPostService {
     @Autowired
     SysPostFeignClient sysPostFeignClient;
 
-    @Autowired
-    @Lazy
-    protected cn.ibizlab.core.ou.service.ISysEmployeeService sysemployeeService;
 
     @Override
     public boolean create(SysPost et) {

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

@@ -25,84 +25,6 @@
 
 
 
-    <!--输出实体[SYS_EMP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_emp-1-1">
-        <createTable tableName="IBZEMP">
-                <column name="USERID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_EMP_USERID"/>
-                </column>
-                <column name="USERNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="PERSONNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="USERCODE" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="LOGINNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="PASSWORD" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="DOMAINS" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="MDEPTID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="MDEPTCODE" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="MDEPTNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="BCODE" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="POSTID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="POSTCODE" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="POSTNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="ORGID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="ORGCODE" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="ORGNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="NICKNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="SEX" remarks="" type="VARCHAR(20)">
-                </column>
-                <column name="CERTCODE" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="PHONE" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="BIRTHDAY" remarks="" type="DATETIME">
-                </column>
-                <column name="EMAIL" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="AVATAR" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="ADDR" remarks="" type="VARCHAR(255)">
-                </column>
-                <column name="USERICON" remarks="" type="VARCHAR(255)">
-                </column>
-                <column name="IPADDR" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="THEME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="LANG" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="FONTSIZE" remarks="" type="VARCHAR(10)">
-                </column>
-                <column name="MEMO" remarks="" type="VARCHAR(255)">
-                </column>
-                <column name="RESERVER" remarks="" type="VARCHAR(255)">
-                </column>
-                <column name="SHOWORDER" remarks="" type="INT">
-                </column>
-                <column name="ENABLE" remarks="" type="INT">
-                </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="UPDATEDATE" remarks="" type="DATETIME">
-                </column>
-        </createTable>
-    </changeSet>
 
 
 
@@ -148,15 +70,5 @@
 
 
 
-        <!--输出实体[SYS_EMP]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_emp-1-2">
-       <addForeignKeyConstraint baseColumnNames="MDEPTID" baseTableName="IBZEMP" constraintName="DER1N_SYS_EMP_SYS_DEPT_MDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
-    </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_emp-1-3">
-       <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZEMP" constraintName="DER1N_SYS_EMP_SYS_ORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
-    </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_emp-1-4">
-       <addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZEMP" constraintName="DER1N_SYS_EMP_SYS_POST_POSTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
-    </changeSet>
 
 </databaseChangeLog>