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/base/mapper/HROMHierarchyMapper.java

@@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSONObject;
 public interface HROMHierarchyMapper extends BaseMapper<HROMHierarchy>{
 
     Page<HROMHierarchy> searchDefault(IPage page, @Param("srf") HROMHierarchySearchContext context, @Param("ew") Wrapper<HROMHierarchy> wrapper) ;
+    Page<HROMHierarchy> searchRootOrg(IPage page, @Param("srf") HROMHierarchySearchContext context, @Param("ew") Wrapper<HROMHierarchy> wrapper) ;
     @Override
     HROMHierarchy selectById(Serializable id);
     @Override

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/service/IHROMHierarchyService.java

@@ -37,6 +37,7 @@ public interface IHROMHierarchyService extends IService<HROMHierarchy>{
     boolean save(HROMHierarchy et) ;
     void saveBatch(List<HROMHierarchy> list) ;
     Page<HROMHierarchy> searchDefault(HROMHierarchySearchContext context) ;
+    Page<HROMHierarchy> searchRootOrg(HROMHierarchySearchContext context) ;
     List<HROMHierarchy> selectByHromhierarchycatid(String omhierarchycatid) ;
     void removeByHromhierarchycatid(String omhierarchycatid) ;
     List<HROMHierarchy> selectByPomhierarchyid(String omhierarchyid) ;

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/service/impl/HROMHierarchyServiceImpl.java

@@ -195,6 +195,15 @@ public class HROMHierarchyServiceImpl extends ServiceImpl<HROMHierarchyMapper, H
         return new PageImpl<HROMHierarchy>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
+    /**
+     * 查询集合 顶级组织
+     */
+    @Override
+    public Page<HROMHierarchy> searchRootOrg(HROMHierarchySearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<HROMHierarchy> pages=baseMapper.searchRootOrg(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<HROMHierarchy>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
 
 
     /**

humanresource-core/src/main/resources/mapper/base/hromhierarchy/HROMHierarchyMapper.xml

@@ -55,11 +55,26 @@
          <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
      </select>
 
+    <!--数据集合[RootOrg]-->
+	 <select id="searchRootOrg"  parameterType="cn.ibizlab.humanresource.core.base.filter.HROMHierarchySearchContext"  resultMap="HROMHierarchyResultMap">
+         select t1.* from (
+                <include refid="RootOrg" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
 		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t41.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t21.`ORGANIZATIONNAME` AS `POMHIERARCHYNAME`, t31.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.ORGANIZATIONID = t31.ORGANIZATIONID  LEFT JOIN OMHIERARCHYCAT t41 ON t1.HROMHIERARCHYCATID = t41.OMHIERARCHYCATID  
 			]]>
     </sql>
+    <!--数据查询[RootOrg]-->
+    <sql id="RootOrg" databaseId="mysql">
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t41.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t21.`ORGANIZATIONNAME` AS `POMHIERARCHYNAME`, t31.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.ORGANIZATIONID = t31.ORGANIZATIONID  LEFT JOIN OMHIERARCHYCAT t41 ON t1.HROMHIERARCHYCATID = t41.OMHIERARCHYCATID  
+					 WHERE 	( t1.`POMHIERARCHYID` IS NULL )
+			]]>
+    </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
 		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t41.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t21.`ORGANIZATIONNAME` AS `POMHIERARCHYNAME`, t31.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.ORGANIZATIONID = t31.ORGANIZATIONID  LEFT JOIN OMHIERARCHYCAT t41 ON t1.HROMHIERARCHYCATID = t41.OMHIERARCHYCATID  

humanresource-core/src/main/resources/permission/systemResource.json

@@ -63,7 +63,7 @@
     "dename":"HROMHierarchy",
     "delogicname":"组织层次结构",
     "sysmoudle":{"id":"BASE","name":"基础"},
-    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "dedataset":[{"id":"Default" , "name":"DEFAULT"},{"id":"RootOrg" , "name":"顶级组织"}],
     "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
     "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
      }

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/rest/HROMHierarchyResource.java

@@ -160,6 +160,27 @@ public class HROMHierarchyResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(hromhierarchyMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HROMHierarchy-searchRootOrg-all') and hasPermission(#context,'iBizHumanResources-HROMHierarchy-Get')")
+	@ApiOperation(value = "获取顶级组织", tags = {"组织层次结构" } ,notes = "获取顶级组织")
+    @RequestMapping(method= RequestMethod.GET , value="/hromhierarchies/fetchrootorg")
+	public ResponseEntity<List<HROMHierarchyDTO>> fetchRootOrg(HROMHierarchySearchContext context) {
+        Page<HROMHierarchy> domains = hromhierarchyService.searchRootOrg(context) ;
+        List<HROMHierarchyDTO> list = hromhierarchyMapping.toDto(domains.getContent());
+        return ResponseEntity.status(HttpStatus.OK)
+                .header("x-page", String.valueOf(context.getPageable().getPageNumber()))
+                .header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
+                .header("x-total", String.valueOf(domains.getTotalElements()))
+                .body(list);
+	}
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HROMHierarchy-searchRootOrg-all') and hasPermission(#context,'iBizHumanResources-HROMHierarchy-Get')")
+	@ApiOperation(value = "查询顶级组织", tags = {"组织层次结构" } ,notes = "查询顶级组织")
+    @RequestMapping(method= RequestMethod.POST , value="/hromhierarchies/searchrootorg")
+	public ResponseEntity<Page<HROMHierarchyDTO>> searchRootOrg(@RequestBody HROMHierarchySearchContext context) {
+        Page<HROMHierarchy> domains = hromhierarchyService.searchRootOrg(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(hromhierarchyMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
     @PreAuthorize("hasPermission(this.hromhierarchyMapping.toDomain(#hromhierarchydto),'iBizHumanResources-HROMHierarchy-Create')")
     @ApiOperation(value = "根据结构层次类别建立组织层次结构", tags = {"组织层次结构" },  notes = "根据结构层次类别建立组织层次结构")
 	@RequestMapping(method = RequestMethod.POST, value = "/hromhierarchycats/{hromhierarchycat_id}/hromhierarchies")
@@ -293,5 +314,28 @@ public class HROMHierarchyResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(hromhierarchyMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HROMHierarchy-searchRootOrg-all') and hasPermission(#context,'iBizHumanResources-HROMHierarchy-Get')")
+	@ApiOperation(value = "根据结构层次类别获取顶级组织", tags = {"组织层次结构" } ,notes = "根据结构层次类别获取顶级组织")
+    @RequestMapping(method= RequestMethod.GET , value="/hromhierarchycats/{hromhierarchycat_id}/hromhierarchies/fetchrootorg")
+	public ResponseEntity<List<HROMHierarchyDTO>> fetchHROMHierarchyRootOrgByHROMHierarchyCat(@PathVariable("hromhierarchycat_id") String hromhierarchycat_id,HROMHierarchySearchContext context) {
+        context.setN_hromhierarchycatid_eq(hromhierarchycat_id);
+        Page<HROMHierarchy> domains = hromhierarchyService.searchRootOrg(context) ;
+        List<HROMHierarchyDTO> list = hromhierarchyMapping.toDto(domains.getContent());
+	    return ResponseEntity.status(HttpStatus.OK)
+                .header("x-page", String.valueOf(context.getPageable().getPageNumber()))
+                .header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
+                .header("x-total", String.valueOf(domains.getTotalElements()))
+                .body(list);
+	}
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HROMHierarchy-searchRootOrg-all') and hasPermission(#context,'iBizHumanResources-HROMHierarchy-Get')")
+	@ApiOperation(value = "根据结构层次类别查询顶级组织", tags = {"组织层次结构" } ,notes = "根据结构层次类别查询顶级组织")
+    @RequestMapping(method= RequestMethod.POST , value="/hromhierarchycats/{hromhierarchycat_id}/hromhierarchies/searchrootorg")
+	public ResponseEntity<Page<HROMHierarchyDTO>> searchHROMHierarchyRootOrgByHROMHierarchyCat(@PathVariable("hromhierarchycat_id") String hromhierarchycat_id, @RequestBody HROMHierarchySearchContext context) {
+        context.setN_hromhierarchycatid_eq(hromhierarchycat_id);
+        Page<HROMHierarchy> domains = hromhierarchyService.searchRootOrg(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(hromhierarchyMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
 }