jackwang 部署微服务接口

config.xml

@@ -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

@@ -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

@@ -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/humanresource/domain/HREmployee.java

@@ -103,6 +103,35 @@ public class HREmployee extends EntityMP implements Serializable {
     @JSONField(name = "employeecode")
     @JsonProperty("employeecode")
     private String employeecode;
+    /**
+     * 证件类型
+     */
+    @TableField(value = "certtype")
+    @JSONField(name = "certtype")
+    @JsonProperty("certtype")
+    private String certtype;
+    /**
+     * 证件号码
+     */
+    @TableField(value = "certnum")
+    @JSONField(name = "certnum")
+    @JsonProperty("certnum")
+    private String certnum;
+    /**
+     * 出生日期
+     */
+    @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(exist = false)
+    @JSONField(name = "age")
+    @JsonProperty("age")
+    private String age;
 
     /**
      * 
@@ -138,6 +167,40 @@ public class HREmployee extends EntityMP implements Serializable {
         this.modify("employeecode",employeecode);
     }
 
+    /**
+     * 设置 [证件类型]
+     */
+    public void setCerttype(String certtype){
+        this.certtype = certtype ;
+        this.modify("certtype",certtype);
+    }
+
+    /**
+     * 设置 [证件号码]
+     */
+    public void setCertnum(String certnum){
+        this.certnum = certnum ;
+        this.modify("certnum",certnum);
+    }
+
+    /**
+     * 设置 [出生日期]
+     */
+    public void setBirthday(Timestamp birthday){
+        this.birthday = birthday ;
+        this.modify("birthday",birthday);
+    }
+
+    /**
+     * 格式化日期 [出生日期]
+     */
+    public String formatBirthday(){
+        if (this.birthday == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(birthday);
+    }
 
 }
 

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/filter/HREmployeeSearchContext.java

@@ -41,6 +41,13 @@ public class HREmployeeSearchContext extends QueryWrapperContext<HREmployee> {
             this.getSearchCond().eq("organizationid", n_organizationid_eq);
         }
     }
+	private String n_certtype_eq;//[证件类型]
+	public void setN_certtype_eq(String n_certtype_eq) {
+        this.n_certtype_eq = n_certtype_eq;
+        if(!ObjectUtils.isEmpty(this.n_certtype_eq)){
+            this.getSearchCond().eq("certtype", n_certtype_eq);
+        }
+    }
 
     /**
 	 * 启用快速搜索

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

@@ -152,7 +152,7 @@
 
 
     <!--输出实体[HREMPLOYEE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-9-7">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-18-7">
         <createTable tableName="EMPLOYEE">
                 <column name="EMPLOYEENAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -171,6 +171,12 @@
                 </column>
                 <column name="EMPLOYEECODE" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="CERTTYPE" remarks="" type="VARCHAR(60)">
+                </column>
+                <column name="CERTNUM" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="BIRTHDAY" remarks="" type="DATETIME">
+                </column>
         </createTable>
     </changeSet>
 
@@ -270,7 +276,7 @@
 
 
     <!--输出实体[HROMHIERARCHYCAT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchycat-97-12">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchycat-99-12">
         <createTable tableName="OMHIERARCHYCAT">
                 <column name="OMHIERARCHYCATID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_HROMHIERARCHYCAT_OMHIERARCH"/>
@@ -510,7 +516,7 @@
        <addForeignKeyConstraint baseColumnNames="HRDUTYID" baseTableName="T_HRDUTYSKILL" constraintName="DER1N_HRDUTYSKILL_HRDUTY_HRDUT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRDUTYID" referencedTableName="T_HRDUTY" validate="true"/>
     </changeSet>
         <!--输出实体[HREMPLOYEE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-9-25">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-18-25">
        <addForeignKeyConstraint baseColumnNames="ORGANIZATIONID" baseTableName="EMPLOYEE" constraintName="DER1N_EMPLOYEE_ORGANIZATION_OR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
         <!--输出实体[HRLEAVE]外键关系 -->

humanresource-core/src/main/resources/mapper/humanresource/hremployee/HREmployeeMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="HREmployeeResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`ORGANIZATIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1  ) t1 where employeeid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHDAY`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`ORGANIZATIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1  ) t1 where employeeid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`ORGANIZATIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1  
+		<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHDAY`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`ORGANIZATIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`ORGANIZATIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1  
+		<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHDAY`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`ORGANIZATIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1  
 			]]>
     </sql>
 </mapper>

humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile

@@ -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

@@ -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/HREmployeeDTO.java

@@ -90,6 +90,39 @@ public class HREmployeeDTO extends DTOBase implements Serializable {
     @JsonProperty("employeecode")
     private String employeecode;
 
+    /**
+     * 属性 [CERTTYPE]
+     *
+     */
+    @JSONField(name = "certtype")
+    @JsonProperty("certtype")
+    private String certtype;
+
+    /**
+     * 属性 [CERTNUM]
+     *
+     */
+    @JSONField(name = "certnum")
+    @JsonProperty("certnum")
+    private String certnum;
+
+    /**
+     * 属性 [BIRTHDAY]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "birthday" , format="yyyy-MM-dd")
+    @JsonProperty("birthday")
+    private Timestamp birthday;
+
+    /**
+     * 属性 [AGE]
+     *
+     */
+    @JSONField(name = "age")
+    @JsonProperty("age")
+    private String age;
+
 
     /**
      * 设置 [EMPLOYEENAME]
@@ -115,6 +148,30 @@ public class HREmployeeDTO extends DTOBase implements Serializable {
         this.modify("employeecode",employeecode);
     }
 
+    /**
+     * 设置 [CERTTYPE]
+     */
+    public void setCerttype(String  certtype){
+        this.certtype = certtype ;
+        this.modify("certtype",certtype);
+    }
+
+    /**
+     * 设置 [CERTNUM]
+     */
+    public void setCertnum(String  certnum){
+        this.certnum = certnum ;
+        this.modify("certnum",certnum);
+    }
+
+    /**
+     * 设置 [BIRTHDAY]
+     */
+    public void setBirthday(Timestamp  birthday){
+        this.birthday = birthday ;
+        this.modify("birthday",birthday);
+    }
+
 
 }