lab_gzf 部署微服务接口

assetmanagement-app/assetmanagement-app-assetmanagement/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 /assetmanagement-app-assetmanagement.jar
 
-EXPOSE 10325
+EXPOSE 8080
 
 ADD assetmanagement-app-assetmanagement.jar /assetmanagement-app-assetmanagement.jar

assetmanagement-app/assetmanagement-app-assetmanagement/src/main/docker/assetmanagement-app-assetmanagement.yaml

@@ -3,25 +3,9 @@ services:
   assetmanagement-app-assetmanagement:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/assetmanagement-app-assetmanagement:latest
     ports:
-      - "10325:10325"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10325
-      - 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:

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/mapper/EAMAssetMapper.java

@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSONObject;
 
 public interface EAMAssetMapper extends BaseMapper<EAMAsset>{
 
+    Page<EAMAsset> searchChildAsset(IPage page, @Param("srf") EAMAssetSearchContext context, @Param("ew") Wrapper<EAMAsset> wrapper) ;
     Page<EAMAsset> searchDefault(IPage page, @Param("srf") EAMAssetSearchContext context, @Param("ew") Wrapper<EAMAsset> wrapper) ;
     @Override
     EAMAsset selectById(Serializable id);

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/service/IEAMAssetService.java

@@ -36,6 +36,7 @@ public interface IEAMAssetService extends IService<EAMAsset>{
     boolean checkKey(EAMAsset et) ;
     boolean save(EAMAsset et) ;
     void saveBatch(List<EAMAsset> list) ;
+    Page<EAMAsset> searchChildAsset(EAMAssetSearchContext context) ;
     Page<EAMAsset> searchDefault(EAMAssetSearchContext context) ;
     List<EAMAsset> selectByEamassetstateid(String eamassetstateid) ;
     void removeByEamassetstateid(String eamassetstateid) ;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/service/impl/EAMAssetServiceImpl.java

@@ -211,6 +211,15 @@ public class EAMAssetServiceImpl extends ServiceImpl<EAMAssetMapper, EAMAsset> i
     }
 
 
+    /**
+     * 查询集合 下级资产
+     */
+    @Override
+    public Page<EAMAsset> searchChildAsset(EAMAssetSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<EAMAsset> pages=baseMapper.searchChildAsset(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<EAMAsset>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
     /**
      * 查询集合 DEFAULT
      */

assetmanagement-core/src/main/resources/mapper/asset/eamasset/EAMAssetMapper.xml

@@ -56,6 +56,15 @@
 			 where  eamlocationid=#{eamlocationid}
      </select>
 
+    <!--数据集合[ChildAsset]-->
+	 <select id="searchChildAsset"  parameterType="cn.ibizlab.assetmanagement.core.asset.filter.EAMAssetSearchContext"  resultMap="EAMAssetResultMap">
+         select t1.* from (
+                <include refid="ChildAsset" />
+         )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]-->
 	 <select id="searchDefault"  parameterType="cn.ibizlab.assetmanagement.core.asset.filter.EAMAssetSearchContext"  resultMap="EAMAssetResultMap">
          select t1.* from (
@@ -65,6 +74,12 @@
          <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
      </select>
 
+    <!--数据查询[ChildAsset]-->
+    <sql id="ChildAsset" databaseId="mysql">
+		<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID  LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID  
+					 WHERE 	( t1.`PASSETID` =  #{srf.datacontext.srfparentkey} )
+			]]>
+    </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
 		<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID  LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID  

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

@@ -183,7 +183,7 @@
     "dename":"EAMAsset",
     "delogicname":"资产",
     "sysmoudle":{"id":"ASSET","name":"资产管理"},
-    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "dedataset":[{"id":"ChildAsset" , "name":"下级资产"},{"id":"Default" , "name":"DEFAULT"}],
     "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":"创建人"}]
      }

assetmanagement-provider/assetmanagement-provider-assetapi/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 /assetmanagement-provider-assetapi.jar
 
-EXPOSE 8081
+EXPOSE 10315
 
 ADD assetmanagement-provider-assetapi.jar /assetmanagement-provider-assetapi.jar

assetmanagement-provider/assetmanagement-provider-assetapi/src/main/docker/assetmanagement-provider-assetapi.yaml

@@ -3,9 +3,25 @@ services:
   assetmanagement-provider-assetapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/assetmanagement-provider-assetapi:latest
     ports:
-      - "8081:8081"
+      - "10315:10315"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=10315
+      - 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:

assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/rest/EAMAssetResource.java

@@ -139,6 +139,27 @@ public class EAMAssetResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizAssetManagement-EAMAsset-searchChildAsset-all') and hasPermission(#context,'iBizAssetManagement-EAMAsset-Get')")
+	@ApiOperation(value = "获取下级资产", tags = {"资产" } ,notes = "获取下级资产")
+    @RequestMapping(method= RequestMethod.GET , value="/eamassets/fetchchildasset")
+	public ResponseEntity<List<EAMAssetDTO>> fetchChildAsset(EAMAssetSearchContext context) {
+        Page<EAMAsset> domains = eamassetService.searchChildAsset(context) ;
+        List<EAMAssetDTO> list = eamassetMapping.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','iBizAssetManagement-EAMAsset-searchChildAsset-all') and hasPermission(#context,'iBizAssetManagement-EAMAsset-Get')")
+	@ApiOperation(value = "查询下级资产", tags = {"资产" } ,notes = "查询下级资产")
+    @RequestMapping(method= RequestMethod.POST , value="/eamassets/searchchildasset")
+	public ResponseEntity<Page<EAMAssetDTO>> searchChildAsset(@RequestBody EAMAssetSearchContext context) {
+        Page<EAMAsset> domains = eamassetService.searchChildAsset(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(eamassetMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizAssetManagement-EAMAsset-searchDefault-all') and hasPermission(#context,'iBizAssetManagement-EAMAsset-Get')")
 	@ApiOperation(value = "获取DEFAULT", tags = {"资产" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/eamassets/fetchdefault")
@@ -270,6 +291,29 @@ public class EAMAssetResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizAssetManagement-EAMAsset-searchChildAsset-all') and hasPermission(#context,'iBizAssetManagement-EAMAsset-Get')")
+	@ApiOperation(value = "根据功能位置获取下级资产", tags = {"资产" } ,notes = "根据功能位置获取下级资产")
+    @RequestMapping(method= RequestMethod.GET , value="/eamlocations/{eamlocation_id}/eamassets/fetchchildasset")
+	public ResponseEntity<List<EAMAssetDTO>> fetchEAMAssetChildAssetByEAMLocation(@PathVariable("eamlocation_id") String eamlocation_id,EAMAssetSearchContext context) {
+        context.setN_eamlocationid_eq(eamlocation_id);
+        Page<EAMAsset> domains = eamassetService.searchChildAsset(context) ;
+        List<EAMAssetDTO> list = eamassetMapping.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','iBizAssetManagement-EAMAsset-searchChildAsset-all') and hasPermission(#context,'iBizAssetManagement-EAMAsset-Get')")
+	@ApiOperation(value = "根据功能位置查询下级资产", tags = {"资产" } ,notes = "根据功能位置查询下级资产")
+    @RequestMapping(method= RequestMethod.POST , value="/eamlocations/{eamlocation_id}/eamassets/searchchildasset")
+	public ResponseEntity<Page<EAMAssetDTO>> searchEAMAssetChildAssetByEAMLocation(@PathVariable("eamlocation_id") String eamlocation_id, @RequestBody EAMAssetSearchContext context) {
+        context.setN_eamlocationid_eq(eamlocation_id);
+        Page<EAMAsset> domains = eamassetService.searchChildAsset(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(eamassetMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizAssetManagement-EAMAsset-searchDefault-all') and hasPermission(#context,'iBizAssetManagement-EAMAsset-Get')")
 	@ApiOperation(value = "根据功能位置获取DEFAULT", tags = {"资产" } ,notes = "根据功能位置获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/eamlocations/{eamlocation_id}/eamassets/fetchdefault")

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibizassetmanagement/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizassetmanagement/
-      mvn clean package -Passetmanagement
-      cd assetmanagement-app/assetmanagement-app-assetmanagement
-      mvn -Passetmanagement docker:build
-      mvn -Passetmanagement docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/assetmanagement-app-assetmanagement.yaml iBizEE --with-registry-auth
+      mvn clean package -Passetapi
+      cd assetmanagement-provider/assetmanagement-provider-assetapi
+      mvn -Passetapi docker:build
+      mvn -Passetapi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/assetmanagement-provider-assetapi.yaml iBizEE --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>