Skip to content

I
iBiz人力资源
提交 3ed55441 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

jackwang 部署微服务接口

上级 2589461a
隐藏空白字符变更
内嵌 并排
正在显示 包含 73 行增加 和 34 行删除
config.xml
浏览文件 @ 3ed55441
......@@ -37,11 +37,11 @@
git clone -b master $para2 ibizhumanresources/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizhumanresources/
mvn clean package -Ppim
cd humanresource-app/humanresource-app-pim
mvn -Ppim docker:build
mvn -Ppim docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
mvn clean package -Phrapi
cd humanresource-provider/humanresource-provider-hrapi
mvn -Phrapi docker:build
mvn -Phrapi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile
浏览文件 @ 3ed55441
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
EXPOSE 10327
EXPOSE 8080
ADD humanresource-app-pim.jar /humanresource-app-pim.jar
humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml
浏览文件 @ 3ed55441
......@@ -3,25 +3,9 @@ services:
humanresource-app-pim:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
ports:
- "10327:10327"
- "8080:8080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=10327
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
- SPRING_DATASOURCE_PASSWORD=b1@@@772
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy:
resources:
limits:
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/domain/HROMHierarchy.java
浏览文件 @ 3ed55441
......@@ -131,6 +131,13 @@ public class HROMHierarchy extends EntityMP implements Serializable {
@JSONField(name = "showorder")
@JsonProperty("showorder")
private BigInteger showorder;
/**
* 名称
*/
@TableField(exist = false)
@JSONField(name = "hromhierarchycatname")
@JsonProperty("hromhierarchycatname")
private String hromhierarchycatname;
/**
*
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/filter/HROMHierarchySearchContext.java
浏览文件 @ 3ed55441
......@@ -83,6 +83,20 @@ public class HROMHierarchySearchContext extends QueryWrapperContext<HROMHierarch
this.getSearchCond().like("organizationname", n_organizationname_like);
}
}
private String n_hromhierarchycatname_eq;//[名称]
public void setN_hromhierarchycatname_eq(String n_hromhierarchycatname_eq) {
this.n_hromhierarchycatname_eq = n_hromhierarchycatname_eq;
if(!ObjectUtils.isEmpty(this.n_hromhierarchycatname_eq)){
this.getSearchCond().eq("hromhierarchycatname", n_hromhierarchycatname_eq);
}
}
private String n_hromhierarchycatname_like;//[名称]
public void setN_hromhierarchycatname_like(String n_hromhierarchycatname_like) {
this.n_hromhierarchycatname_like = n_hromhierarchycatname_like;
if(!ObjectUtils.isEmpty(this.n_hromhierarchycatname_like)){
this.getSearchCond().like("hromhierarchycatname", n_hromhierarchycatname_like);
}
}
/**
* 启用快速搜索
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/service/impl/HROMHierarchyServiceImpl.java
浏览文件 @ 3ed55441
......@@ -202,6 +202,16 @@ public class HROMHierarchyServiceImpl extends ServiceImpl<HROMHierarchyMapper, H
* @param et
*/
private void fillParentData(HROMHierarchy et){
//实体关系[DER1N_HROMHIERARCHY_HROMHIERARCHYCAT_HROMHIERARCHYCATID_ABD0C1]
if(!ObjectUtils.isEmpty(et.getHromhierarchycatid())){
cn.ibizlab.humanresource.core.base.domain.HROMHierarchyCat hromhierarchycat=et.getHromhierarchycat();
if(ObjectUtils.isEmpty(hromhierarchycat)){
cn.ibizlab.humanresource.core.base.domain.HROMHierarchyCat majorEntity=hromhierarchycatService.get(et.getHromhierarchycatid());
et.setHromhierarchycat(majorEntity);
hromhierarchycat=majorEntity;
}
et.setHromhierarchycatname(hromhierarchycat.getOmhierarchycatname());
}
//实体关系[DER1N_OMHIERARCHY_OMHIERARCHY_POMHIERARCHYID]
if(!ObjectUtils.isEmpty(et.getPomhierarchyid())){
cn.ibizlab.humanresource.core.base.domain.HROMHierarchy pomhierarchy=et.getPomhierarchy();
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 3ed55441
......@@ -112,7 +112,7 @@
<!--输出实体[HROMHIERARCHY]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchy-44-6">
<changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchy-52-6">
<createTable tableName="OMHIERARCHY">
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
......@@ -140,7 +140,7 @@
<!--输出实体[HROMHIERARCHYCAT]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchycat-36-7">
<changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchycat-37-7">
<createTable tableName="OMHIERARCHYCAT">
<column name="OMHIERARCHYCATID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HROMHIERARCHYCAT_OMHIERARCH"/>
......@@ -264,7 +264,7 @@
<!--输出实体[HRORGANIZATION]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrorganization-27-12">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrorganization-28-12">
<createTable tableName="ORGANIZATION">
<column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
</column>
......@@ -305,13 +305,13 @@
<!--输出实体[HRLEGAL]外键关系 -->
<!--输出实体[HROMHIERARCHYPURPOSE]外键关系 -->
<!--输出实体[HROMHIERARCHY]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-44-14">
<changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-52-14">
<addForeignKeyConstraint baseColumnNames="HROMHIERARCHYCATID" baseTableName="OMHIERARCHY" constraintName="DER1N_HROMHIERARCHY_HROMHIERAR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OMHIERARCHYCATID" referencedTableName="OMHIERARCHYCAT" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-44-15">
<changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-52-15">
<addForeignKeyConstraint baseColumnNames="POMHIERARCHYID" baseTableName="OMHIERARCHY" constraintName="DER1N_OMHIERARCHY_OMHIERARCHY_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OMHIERARCHYID" referencedTableName="OMHIERARCHY" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-44-16">
<changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-52-16">
<addForeignKeyConstraint baseColumnNames="ORGANIZATIONID" baseTableName="OMHIERARCHY" constraintName="DER1N_OMHIERARCHY_ORGANIZATION" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
</changeSet>
<!--输出实体[HROMHIERARCHYCAT]外键关系 -->
......
humanresource-core/src/main/resources/mapper/base/hromhierarchy/HROMHierarchyMapper.xml
浏览文件 @ 3ed55441
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="HROMHierarchyResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t11.`OMHIERARCHYNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1 LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID LEFT JOIN ORGANIZATION t21 ON t1.ORGANIZATIONID = t21.ORGANIZATIONID ) t1 where omhierarchyid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t31.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t11.`OMHIERARCHYNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1 LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID LEFT JOIN ORGANIZATION t21 ON t1.ORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN OMHIERARCHYCAT t31 ON t1.HROMHIERARCHYCATID = t31.OMHIERARCHYCATID ) t1 where omhierarchyid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -57,12 +57,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t11.`OMHIERARCHYNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1 LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID LEFT JOIN ORGANIZATION t21 ON t1.ORGANIZATIONID = t21.ORGANIZATIONID
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t31.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t11.`OMHIERARCHYNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1 LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID LEFT JOIN ORGANIZATION t21 ON t1.ORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN OMHIERARCHYCAT t31 ON t1.HROMHIERARCHYCATID = t31.OMHIERARCHYCATID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t11.`OMHIERARCHYNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1 LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID LEFT JOIN ORGANIZATION t21 ON t1.ORGANIZATIONID = t21.ORGANIZATIONID
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t31.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t11.`OMHIERARCHYNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1 LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID LEFT JOIN ORGANIZATION t21 ON t1.ORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN OMHIERARCHYCAT t31 ON t1.HROMHIERARCHYCATID = t31.OMHIERARCHYCATID
]]>
</sql>
</mapper>
......
humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile
浏览文件 @ 3ed55441
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-provider-hrapi.jar
EXPOSE 8081
EXPOSE 10317
ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar
humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml
浏览文件 @ 3ed55441
......@@ -3,9 +3,25 @@ services:
humanresource-provider-hrapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
ports:
- "8081:8081"
- "10317:10317"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=10317
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
- SPRING_DATASOURCE_PASSWORD=b1@@@772
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy:
resources:
limits:
......
humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HROMHierarchyDTO.java
浏览文件 @ 3ed55441
......@@ -121,6 +121,14 @@ public class HROMHierarchyDTO extends DTOBase implements Serializable {
@JsonProperty("showorder")
private BigInteger showorder;
/**
* 属性 [HROMHIERARCHYCATNAME]
*
*/
@JSONField(name = "hromhierarchycatname")
@JsonProperty("hromhierarchycatname")
private String hromhierarchycatname;
/**
* 设置 [OMHIERARCHYNAME]
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或