Skip to content

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

jackwang 部署微服务接口

上级 c76be530
隐藏空白字符变更
内嵌 并排
正在显示 包含 81 行增加 和 31 行删除
config.xml
浏览文件 @ f14ce3fc
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
git clone -b master $para2 ibizhumanresources/ git clone -b master $para2 ibizhumanresources/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd ibizhumanresources/ cd ibizhumanresources/
mvn clean package -Ppim mvn clean package -Phrapi
cd humanresource-app/humanresource-app-pim cd humanresource-provider/humanresource-provider-hrapi
mvn -Ppim docker:build mvn -Phrapi docker:build
mvn -Ppim docker:push mvn -Phrapi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile
浏览文件 @ f14ce3fc
...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar 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 ADD humanresource-app-pim.jar /humanresource-app-pim.jar
humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml
浏览文件 @ f14ce3fc
...@@ -3,25 +3,9 @@ services: ...@@ -3,25 +3,9 @@ services:
humanresource-app-pim: humanresource-app-pim:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
ports: ports:
- "10327:10327" - "8080:8080"
networks: networks:
- agent_network - 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: deploy:
resources: resources:
limits: limits:
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRDistribution.java
浏览文件 @ f14ce3fc
...@@ -133,6 +133,20 @@ public class HRDistribution extends EntityMP implements Serializable { ...@@ -133,6 +133,20 @@ public class HRDistribution extends EntityMP implements Serializable {
@JSONField(name = "hrpostname") @JSONField(name = "hrpostname")
@JsonProperty("hrpostname") @JsonProperty("hrpostname")
private String hrpostname; private String hrpostname;
/**
* 部门
*/
@TableField(exist = false)
@JSONField(name = "hrorganizationname")
@JsonProperty("hrorganizationname")
private String hrorganizationname;
/**
* 职务
*/
@TableField(value = "hrdutyname")
@JSONField(name = "hrdutyname")
@JsonProperty("hrdutyname")
private String hrdutyname;
/** /**
* 员工 * 员工
...@@ -212,6 +226,14 @@ public class HRDistribution extends EntityMP implements Serializable { ...@@ -212,6 +226,14 @@ public class HRDistribution extends EntityMP implements Serializable {
this.modify("hrpostid",hrpostid); this.modify("hrpostid",hrpostid);
} }
/**
* 设置 [职务]
*/
public void setHrdutyname(String hrdutyname){
this.hrdutyname = hrdutyname ;
this.modify("hrdutyname",hrdutyname);
}
} }
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/impl/HRDistributionServiceImpl.java
浏览文件 @ f14ce3fc
...@@ -209,6 +209,8 @@ public class HRDistributionServiceImpl extends ServiceImpl<HRDistributionMapper, ...@@ -209,6 +209,8 @@ public class HRDistributionServiceImpl extends ServiceImpl<HRDistributionMapper,
hrpost=majorEntity; hrpost=majorEntity;
} }
et.setHrpostname(hrpost.getHrpostname()); et.setHrpostname(hrpost.getHrpostname());
et.setHrorganizationname(hrpost.getHrorganizationname());
et.setHrdutyname(hrpost.getHrdutyname());
} }
} }
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ f14ce3fc
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<!--输出实体[HRDISTRIBUTION]数据结构 --> <!--输出实体[HRDISTRIBUTION]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrdistribution-34-2"> <changeSet author="a_LAB01_e85d8801c" id="tab-hrdistribution-38-2">
<createTable tableName="T_HRDISTRIBUTION"> <createTable tableName="T_HRDISTRIBUTION">
<column name="UPDATEMAN" remarks="" type="VARCHAR(60)"> <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
</column> </column>
...@@ -47,6 +47,8 @@ ...@@ -47,6 +47,8 @@
</column> </column>
<column name="HRPOSTID" remarks="" type="VARCHAR(100)"> <column name="HRPOSTID" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="HRDUTYNAME" remarks="" type="VARCHAR(200)">
</column>
</createTable> </createTable>
</changeSet> </changeSet>
...@@ -572,10 +574,10 @@ ...@@ -572,10 +574,10 @@
<!--输出实体[HRATTENDANCE]外键关系 --> <!--输出实体[HRATTENDANCE]外键关系 -->
<!--输出实体[HRDISTRIBUTION]外键关系 --> <!--输出实体[HRDISTRIBUTION]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrdistribution-34-21"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrdistribution-38-21">
<addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRDISTRIBUTION" constraintName="DER1N_HRDISTRIBUTION_HREMPLOYE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/> <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRDISTRIBUTION" constraintName="DER1N_HRDISTRIBUTION_HREMPLOYE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
</changeSet> </changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hrdistribution-34-22"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrdistribution-38-22">
<addForeignKeyConstraint baseColumnNames="HRPOSTID" baseTableName="T_HRDISTRIBUTION" constraintName="DER1N_HRDISTRIBUTION_HRPOST_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/> <addForeignKeyConstraint baseColumnNames="HRPOSTID" baseTableName="T_HRDISTRIBUTION" constraintName="DER1N_HRDISTRIBUTION_HRPOST_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[HRDUTY]外键关系 --> <!--输出实体[HRDUTY]外键关系 -->
......
humanresource-core/src/main/resources/mapper/humanresource/hrdistribution/HRDistributionMapper.xml
浏览文件 @ f14ce3fc
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="HRDistributionResultMap" databaseId="mysql"> <select id="selectById" resultMap="HRDistributionResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRDISTRIBUTIONID`, t1.`HRDISTRIBUTIONNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRPOSTID`, t21.`HRPOSTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRDISTRIBUTION` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN T_HRPOST t21 ON t1.HRPOSTID = t21.HRPOSTID ) t1 where hrdistributionid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRDISTRIBUTIONID`, t1.`HRDISTRIBUTIONNAME`, t1.`HRDUTYNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME`, t1.`HRPOSTID`, t21.`HRPOSTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRDISTRIBUTION` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN T_HRPOST t21 ON t1.HRPOSTID = t21.HRPOSTID LEFT JOIN ORGANIZATION t31 ON t21.HRORGANIZATIONID = t31.ORGANIZATIONID ) t1 where hrdistributionid=#{id}]]>
</select> </select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...@@ -47,12 +47,12 @@ ...@@ -47,12 +47,12 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="mysql"> <sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRDISTRIBUTIONID`, t1.`HRDISTRIBUTIONNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRPOSTID`, t21.`HRPOSTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRDISTRIBUTION` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN T_HRPOST t21 ON t1.HRPOSTID = t21.HRPOSTID <![CDATA[ SELECT t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRDISTRIBUTIONID`, t1.`HRDISTRIBUTIONNAME`, t1.`HRDUTYNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME`, t1.`HRPOSTID`, t21.`HRPOSTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRDISTRIBUTION` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN T_HRPOST t21 ON t1.HRPOSTID = t21.HRPOSTID LEFT JOIN ORGANIZATION t31 ON t21.HRORGANIZATIONID = t31.ORGANIZATIONID
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="mysql"> <sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRDISTRIBUTIONID`, t1.`HRDISTRIBUTIONNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRPOSTID`, t21.`HRPOSTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRDISTRIBUTION` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN T_HRPOST t21 ON t1.HRPOSTID = t21.HRPOSTID <![CDATA[ SELECT t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRDISTRIBUTIONID`, t1.`HRDISTRIBUTIONNAME`, t1.`HRDUTYNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME`, t1.`HRPOSTID`, t21.`HRPOSTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRDISTRIBUTION` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN T_HRPOST t21 ON t1.HRPOSTID = t21.HRPOSTID LEFT JOIN ORGANIZATION t31 ON t21.HRORGANIZATIONID = t31.ORGANIZATIONID
]]> ]]>
</sql> </sql>
</mapper> </mapper>
......
humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile
浏览文件 @ f14ce3fc
...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-provider-hrapi.jar 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 ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar
humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml
浏览文件 @ f14ce3fc
...@@ -3,9 +3,25 @@ services: ...@@ -3,9 +3,25 @@ services:
humanresource-provider-hrapi: humanresource-provider-hrapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
ports: ports:
- "8081:8081" - "10317:10317"
networks: networks:
- agent_network - 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: deploy:
resources: resources:
limits: limits:
......
humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRDistributionDTO.java
浏览文件 @ f14ce3fc
...@@ -124,6 +124,22 @@ public class HRDistributionDTO extends DTOBase implements Serializable { ...@@ -124,6 +124,22 @@ public class HRDistributionDTO extends DTOBase implements Serializable {
@JsonProperty("hrpostname") @JsonProperty("hrpostname")
private String hrpostname; private String hrpostname;
/**
* 属性 [HRORGANIZATIONNAME]
*
*/
@JSONField(name = "hrorganizationname")
@JsonProperty("hrorganizationname")
private String hrorganizationname;
/**
* 属性 [HRDUTYNAME]
*
*/
@JSONField(name = "hrdutyname")
@JsonProperty("hrdutyname")
private String hrdutyname;
/** /**
* 设置 [HRDISTRIBUTIONNAME] * 设置 [HRDISTRIBUTIONNAME]
...@@ -165,6 +181,14 @@ public class HRDistributionDTO extends DTOBase implements Serializable { ...@@ -165,6 +181,14 @@ public class HRDistributionDTO extends DTOBase implements Serializable {
this.modify("hrpostid",hrpostid); this.modify("hrpostid",hrpostid);
} }
/**
* 设置 [HRDUTYNAME]
*/
public void setHrdutyname(String hrdutyname){
this.hrdutyname = hrdutyname ;
this.modify("hrdutyname",hrdutyname);
}
} }
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或