Skip to content

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

jackwang 部署微服务接口

上级 2ab1faa9
隐藏空白字符变更
内嵌 并排
正在显示 包含 255 行增加 和 33 行删除
config.xml
浏览文件 @ 3d984393
......@@ -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
浏览文件 @ 3d984393
......@@ -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
浏览文件 @ 3d984393
......@@ -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/HRLegal.java
浏览文件 @ 3d984393
......@@ -96,6 +96,69 @@ public class HRLegal extends EntityMP implements Serializable {
@JSONField(name = "organizationtype")
@JsonProperty("organizationtype")
private String organizationtype;
/**
* 组织层级
*/
@TableField(exist = false)
@JSONField(name = "orglevel")
@JsonProperty("orglevel")
private BigInteger orglevel;
/**
* 运营单位类型
*/
@TableField(exist = false)
@JSONField(name = "operationunittype")
@JsonProperty("operationunittype")
private String operationunittype;
/**
* 排序号
*/
@TableField(exist = false)
@JSONField(name = "showorder")
@JsonProperty("showorder")
private BigInteger showorder;
/**
* 组织编码
*/
@TableField(exist = false)
@JSONField(name = "orgcode")
@JsonProperty("orgcode")
private String orgcode;
/**
* 备注
*/
@TableField(exist = false)
@JSONField(name = "memo")
@JsonProperty("memo")
private String memo;
/**
* 组织简称
*/
@TableField(exist = false)
@JSONField(name = "shortname")
@JsonProperty("shortname")
private String shortname;
/**
* 统一社会信用代码
*/
@TableField(value = "uscc")
@JSONField(name = "uscc")
@JsonProperty("uscc")
private String uscc;
/**
* 开户行
*/
@TableField(value = "bank")
@JSONField(name = "bank")
@JsonProperty("bank")
private String bank;
/**
* 银行账号
*/
@TableField(value = "bankaccount")
@JSONField(name = "bankaccount")
@JsonProperty("bankaccount")
private String bankaccount;
......@@ -107,6 +170,30 @@ public class HRLegal extends EntityMP implements Serializable {
this.modify("legalname",legalname);
}
/**
* 设置 [统一社会信用代码]
*/
public void setUscc(String uscc){
this.uscc = uscc ;
this.modify("uscc",uscc);
}
/**
* 设置 [开户行]
*/
public void setBank(String bank){
this.bank = bank ;
this.modify("bank",bank);
}
/**
* 设置 [银行账号]
*/
public void setBankaccount(String bankaccount){
this.bankaccount = bankaccount ;
this.modify("bankaccount",bankaccount);
}
}
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/domain/HROrganization.java
浏览文件 @ 3d984393
......@@ -131,6 +131,13 @@ public class HROrganization extends EntityMP implements Serializable {
@JSONField(name = "operationunittype")
@JsonProperty("operationunittype")
private String operationunittype;
/**
* 备注
*/
@TableField(value = "memo")
@JSONField(name = "memo")
@JsonProperty("memo")
private String memo;
......@@ -190,6 +197,14 @@ public class HROrganization extends EntityMP implements Serializable {
this.modify("operationunittype",operationunittype);
}
/**
* 设置 [备注]
*/
public void setMemo(String memo){
this.memo = memo ;
this.modify("memo",memo);
}
}
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 3d984393
......@@ -66,7 +66,7 @@
<!--输出实体[HRLEGAL]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrlegal-6-4">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrlegal-14-4">
<createTable tableName="LEGAL">
<column name="LEGALNAME" remarks="" type="VARCHAR(200)">
</column>
......@@ -81,6 +81,12 @@
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
<column name="USCC" remarks="" type="VARCHAR(100)">
</column>
<column name="BANK" remarks="" type="VARCHAR(100)">
</column>
<column name="BANKACCOUNT" remarks="" type="VARCHAR(100)">
</column>
</createTable>
</changeSet>
......@@ -194,7 +200,7 @@
<!--输出实体[HRORGANIZATION]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrorganization-19-10">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrorganization-21-10">
<createTable tableName="ORGANIZATION">
<column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
</column>
......@@ -221,6 +227,8 @@
</column>
<column name="OPERATIONUNITTYPE" remarks="" type="VARCHAR(60)">
</column>
<column name="MEMO" remarks="" type="VARCHAR(2000)">
</column>
</createTable>
</changeSet>
......
humanresource-core/src/main/resources/mapper/base/hrlegal/HRLegalMapper.xml
浏览文件 @ 3d984393
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="HRLegalResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LEGALID`, t1.`LEGALNAME`, t11.`ORGANIZATIONTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `LEGAL` t1 LEFT JOIN ORGANIZATION t11 ON t1.LEGALID = t11.ORGANIZATIONID ) t1 where legalid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`BANK`, t1.`BANKACCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LEGALID`, t1.`LEGALNAME`, t11.`MEMO`, t11.`OPERATIONUNITTYPE`, t11.`ORGANIZATIONTYPE`, t11.`ORGCODE`, t11.`ORGLEVEL`, t11.`SHORTNAME`, t11.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USCC` FROM `LEGAL` t1 LEFT JOIN ORGANIZATION t11 ON t1.LEGALID = t11.ORGANIZATIONID ) t1 where legalid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -27,12 +27,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LEGALID`, t1.`LEGALNAME`, t11.`ORGANIZATIONTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `LEGAL` t1 LEFT JOIN ORGANIZATION t11 ON t1.LEGALID = t11.ORGANIZATIONID
<![CDATA[ SELECT t1.`BANK`, t1.`BANKACCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LEGALID`, t1.`LEGALNAME`, t11.`MEMO`, t11.`OPERATIONUNITTYPE`, t11.`ORGANIZATIONTYPE`, t11.`ORGCODE`, t11.`ORGLEVEL`, t11.`SHORTNAME`, t11.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USCC` FROM `LEGAL` t1 LEFT JOIN ORGANIZATION t11 ON t1.LEGALID = t11.ORGANIZATIONID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LEGALID`, t1.`LEGALNAME`, t11.`ORGANIZATIONTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `LEGAL` t1 LEFT JOIN ORGANIZATION t11 ON t1.LEGALID = t11.ORGANIZATIONID
<![CDATA[ SELECT t1.`BANK`, t1.`BANKACCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LEGALID`, t1.`LEGALNAME`, t11.`MEMO`, t11.`OPERATIONUNITTYPE`, t11.`ORGANIZATIONTYPE`, t11.`ORGCODE`, t11.`ORGLEVEL`, t11.`SHORTNAME`, t11.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USCC` FROM `LEGAL` t1 LEFT JOIN ORGANIZATION t11 ON t1.LEGALID = t11.ORGANIZATIONID
]]>
</sql>
</mapper>
......
humanresource-core/src/main/resources/mapper/base/hrorganization/HROrganizationMapper.xml
浏览文件 @ 3d984393
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="HROrganizationResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`OPERATIONUNITTYPE`, t1.`ORGANIZATIONID`, t1.`ORGANIZATIONNAME`, t1.`ORGANIZATIONTYPE`, t1.`ORGCODE`, t1.`ORGLEVEL`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ORGANIZATION` t1 ) t1 where organizationid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`MEMO`, t1.`OPERATIONUNITTYPE`, t1.`ORGANIZATIONID`, t1.`ORGANIZATIONNAME`, t1.`ORGANIZATIONTYPE`, t1.`ORGCODE`, t1.`ORGLEVEL`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ORGANIZATION` t1 ) t1 where organizationid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -27,12 +27,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`OPERATIONUNITTYPE`, t1.`ORGANIZATIONID`, t1.`ORGANIZATIONNAME`, t1.`ORGANIZATIONTYPE`, t1.`ORGCODE`, t1.`ORGLEVEL`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ORGANIZATION` t1
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`MEMO`, t1.`OPERATIONUNITTYPE`, t1.`ORGANIZATIONID`, t1.`ORGANIZATIONNAME`, t1.`ORGANIZATIONTYPE`, t1.`ORGCODE`, t1.`ORGLEVEL`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ORGANIZATION` t1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`OPERATIONUNITTYPE`, t1.`ORGANIZATIONID`, t1.`ORGANIZATIONNAME`, t1.`ORGANIZATIONTYPE`, t1.`ORGCODE`, t1.`ORGLEVEL`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ORGANIZATION` t1
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`MEMO`, t1.`OPERATIONUNITTYPE`, t1.`ORGANIZATIONID`, t1.`ORGANIZATIONNAME`, t1.`ORGANIZATIONTYPE`, t1.`ORGCODE`, t1.`ORGLEVEL`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ORGANIZATION` t1
]]>
</sql>
</mapper>
......
humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile
浏览文件 @ 3d984393
......@@ -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
浏览文件 @ 3d984393
......@@ -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/HRLegalDTO.java
浏览文件 @ 3d984393
......@@ -81,6 +81,78 @@ public class HRLegalDTO extends DTOBase implements Serializable {
@JsonProperty("organizationtype")
private String organizationtype;
/**
* 属性 [ORGLEVEL]
*
*/
@JSONField(name = "orglevel")
@JsonProperty("orglevel")
private BigInteger orglevel;
/**
* 属性 [OPERATIONUNITTYPE]
*
*/
@JSONField(name = "operationunittype")
@JsonProperty("operationunittype")
private String operationunittype;
/**
* 属性 [SHOWORDER]
*
*/
@JSONField(name = "showorder")
@JsonProperty("showorder")
private BigInteger showorder;
/**
* 属性 [ORGCODE]
*
*/
@JSONField(name = "orgcode")
@JsonProperty("orgcode")
private String orgcode;
/**
* 属性 [MEMO]
*
*/
@JSONField(name = "memo")
@JsonProperty("memo")
private String memo;
/**
* 属性 [SHORTNAME]
*
*/
@JSONField(name = "shortname")
@JsonProperty("shortname")
private String shortname;
/**
* 属性 [USCC]
*
*/
@JSONField(name = "uscc")
@JsonProperty("uscc")
private String uscc;
/**
* 属性 [BANK]
*
*/
@JSONField(name = "bank")
@JsonProperty("bank")
private String bank;
/**
* 属性 [BANKACCOUNT]
*
*/
@JSONField(name = "bankaccount")
@JsonProperty("bankaccount")
private String bankaccount;
/**
* 设置 [LEGALNAME]
......@@ -90,6 +162,30 @@ public class HRLegalDTO extends DTOBase implements Serializable {
this.modify("legalname",legalname);
}
/**
* 设置 [USCC]
*/
public void setUscc(String uscc){
this.uscc = uscc ;
this.modify("uscc",uscc);
}
/**
* 设置 [BANK]
*/
public void setBank(String bank){
this.bank = bank ;
this.modify("bank",bank);
}
/**
* 设置 [BANKACCOUNT]
*/
public void setBankaccount(String bankaccount){
this.bankaccount = bankaccount ;
this.modify("bankaccount",bankaccount);
}
}
humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HROrganizationDTO.java
浏览文件 @ 3d984393
......@@ -121,6 +121,14 @@ public class HROrganizationDTO extends DTOBase implements Serializable {
@JsonProperty("operationunittype")
private String operationunittype;
/**
* 属性 [MEMO]
*
*/
@JSONField(name = "memo")
@JsonProperty("memo")
private String memo;
/**
* 设置 [ORGANIZATIONNAME]
......@@ -178,6 +186,14 @@ public class HROrganizationDTO extends DTOBase implements Serializable {
this.modify("operationunittype",operationunittype);
}
/**
* 设置 [MEMO]
*/
public void setMemo(String memo){
this.memo = memo ;
this.modify("memo",memo);
}
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或