فهرست منبع

Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/main/java/com/persagy/proxy/adm/controller/AdmSystemController.java
lvxianyun 3 سال پیش
والد
کامیت
7abeee870b

+ 10 - 12
src/main/java/com/persagy/proxy/adm/controller/AdmDictController.java

@@ -9,6 +9,7 @@ import com.persagy.proxy.adm.request.AdmCreateRequest;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IAdmDictService;
+import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -35,9 +36,6 @@ import java.util.List;
 @Slf4j
 public class AdmDictController {
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     @Autowired
     private IAdmDictService service;
 
@@ -52,7 +50,7 @@ public class AdmDictController {
     public AdmResponse queryCategory(@QueryParam("projectId") String projectId,
                                      @RequestBody AdmDict request) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         if(StringUtils.isEmpty(request.getType())){
             throw new Exception("type不能为空");
         }
@@ -71,7 +69,7 @@ public class AdmDictController {
     public AdmResponse dictBatch(@QueryParam("projectId") String projectId,
                                      @RequestBody AdmCreateRequest<AdmDictBatch> request) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         //方案设定:方案id :全新设定(schemeZero)、方案1(schemeOne)、方案2(schemeTwo),
         //"注意SchemeId为必填字段 ,优先级在列表中[R,S,M] ,一级标签[技术参数,基本参数] 列表为String类型
         return AdmResponse.success(new ArrayList<>());
@@ -88,7 +86,7 @@ public class AdmDictController {
     public AdmResponse query(@QueryParam("projectId") String projectId,
                              @RequestBody AdmDictQueryCriteria request) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         request.setName(request.getType());
         return service.doQueryObjectInfo(context, request, AdmDictConstant.CLASS_CODE, AdmObjectInfo.class);
     }
@@ -105,7 +103,7 @@ public class AdmDictController {
     public AdmResponse familyQuery(@QueryParam("projectId") String projectId,
                              @RequestBody AdmQueryCriteria request) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         return AdmResponse.success(new ArrayList<>());
     }
 
@@ -120,7 +118,7 @@ public class AdmDictController {
     public AdmResponse resetDic(@QueryParam("projectId") String projectId,
                                    @RequestBody AdmDictQueryCriteria request) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         return service.resetDic(context,request,null,AdmObjectInfo.class);
     }
 
@@ -136,7 +134,7 @@ public class AdmDictController {
     public AdmResponse resetType(@QueryParam("projectId") String projectId,
                                 @RequestBody AdmDictQueryCriteria request) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         if(StringUtils.isEmpty(request.getType())){
             throw new Exception("type不能为空");
         }
@@ -155,7 +153,7 @@ public class AdmDictController {
     public AdmResponse settingDicProject(@QueryParam("projectId") String projectId,
                                  @RequestBody AdmCreateRequest<AdmObjectInfo> request) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         return service.settingDicProject(context,request,AdmObjectInfo.class);
     }
 
@@ -171,7 +169,7 @@ public class AdmDictController {
     public AdmResponse querySystemEquipCategory(@QueryParam("projectId") String projectId,
                                  @RequestBody AdmDict request) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         request.setType(AdmDictCategoryEnum.SYSTEM_EQUIP.getValue());
         return service.queryCategory(context,request,AdmObjectType.class);
     }
@@ -188,7 +186,7 @@ public class AdmDictController {
     public AdmResponse queryMorlDict(@QueryParam("projectId") String projectId,
                                                 @RequestBody List<String> dictTypeList) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         if(CollUtil.isEmpty(dictTypeList)){
             return AdmResponse.success(new ArrayList<>());
         }

+ 6 - 5
src/main/java/com/persagy/proxy/adm/controller/AdmLabslController.java

@@ -5,6 +5,7 @@ import com.persagy.proxy.adm.model.AdmObjectInfo;
 import com.persagy.proxy.adm.model.AdmObjectType;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IAdmLabslService;
+import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +44,7 @@ public class AdmLabslController {
      */
     @PostMapping("/category")
     public AdmResponse queryCategory() throws Exception {
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, AdmCommonConstant.PROJECTID, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         return service.queryCategory(context, AdmObjectInfo.class);
     }
 
@@ -55,7 +56,7 @@ public class AdmLabslController {
      */
     @PostMapping("/zone/type")
     public AdmResponse queryZoneType() throws Exception {
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, AdmCommonConstant.PROJECTID, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         return service.queryZoneType(context, AdmObjectInfo.class);
     }
 
@@ -66,7 +67,7 @@ public class AdmLabslController {
      */
     @PostMapping("/building/floor")
     public AdmResponse queryBuildFloor(@QueryParam("projectId") String projectId) throws Exception {
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         return service.queryBuildFloor(context, AdmObjectInfo.class);
     }
 
@@ -78,7 +79,7 @@ public class AdmLabslController {
      */
     @PostMapping("/query/equip")
     public AdmResponse queryEquipType(@QueryParam("projectId") String projectId) throws Exception {
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         return service.queryBuildFloor(context, AdmObjectInfo.class);
     }
 
@@ -91,7 +92,7 @@ public class AdmLabslController {
     @PostMapping("/major/category")
     public AdmResponse queryMajorCategory(@QueryParam("projectId") String projectId,
                                           @RequestBody List<String> ids) throws Exception {
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         return service.queryMajorCategory(context, ids , AdmObjectType.class);
     }
 

+ 7 - 6
src/main/java/com/persagy/proxy/adm/controller/AdmLocationPointController.java

@@ -9,6 +9,7 @@ import com.persagy.proxy.adm.request.AdmCreateRequest;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IAdmLocationPointService;
+import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.DmpResult;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import lombok.extern.slf4j.Slf4j;
@@ -52,7 +53,7 @@ public class AdmLocationPointController {
     public AdmResponse count(@QueryParam("projectId") String projectId,
                              @RequestBody AdmQueryCriteria request) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         request.setName("point");
         request.setOnlyCount(true);
         return service.doQuery(context, request, AdmLocationPoint.class);
@@ -69,7 +70,7 @@ public class AdmLocationPointController {
     public AdmResponse query(@QueryParam("projectId") String projectId,
                              @RequestBody AdmQueryCriteria request) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         request.setName("point");
         // 查询信息点标签
         AdmResponse admResponse = service.doQuery(context, request, AdmLocationPoint.class);
@@ -87,7 +88,7 @@ public class AdmLocationPointController {
     @PostMapping("/create")
     public AdmResponse create(@RequestBody AdmCreateRequest<AdmLocationPoint> createRequest, @QueryParam("projectId") String projectId) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         List<AdmLocationPoint> vos = CollUtil.newArrayList(createRequest.getContent());
         log.info("创建条件"+vos.toString());
         vos = service.doInsert(context, AdmLocationPoint.class, vos);
@@ -104,7 +105,7 @@ public class AdmLocationPointController {
     @PostMapping("/update")
     public AdmResponse update(@RequestBody AdmCreateRequest<AdmLocationPoint> createRequest, @QueryParam("projectId") String projectId) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         List<AdmLocationPoint> vos = CollUtil.newArrayList(createRequest.getContent());
         vos = service.doUpdate(context, AdmLocationPoint.class, vos);
         return AdmResponse.success(vos);
@@ -120,7 +121,7 @@ public class AdmLocationPointController {
     @PostMapping("/delete")
     public AdmResponse delete(@QueryParam("projectId") String projectId, @RequestBody List<AdmLocationPoint> vos) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         service.doDelete(context, vos);
         return AdmResponse.success();
     }
@@ -134,7 +135,7 @@ public class AdmLocationPointController {
     @PostMapping("/delete-image")
     public AdmResponse deleteImage(@QueryParam("projectId") String projectId, @RequestBody List<AdmPointImage> vos) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         // 删除图片参数转换
         List<AdmLocationPoint> points = deleteImageParamRevert(vos);
         service.doUpdate(context,AdmLocationPoint.class, points);

+ 3 - 2
src/main/java/com/persagy/proxy/adm/controller/AdmPlanarController.java

@@ -5,6 +5,7 @@ import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.model.*;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IAdmPlanarService;
+import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +45,7 @@ public class AdmPlanarController {
     @PostMapping("/equip")
     public AdmResponse queryPlanarEquip(@QueryParam("projectId") String projectId,
                                           @RequestBody AdmPlanarEquipRequests requests) throws Exception {
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         if(requests == null){
             throw new Exception("请求参数不能为空");
         }
@@ -59,7 +60,7 @@ public class AdmPlanarController {
     @PostMapping("/space")
     public AdmResponse queryPlanarSpace(@QueryParam("projectId") String projectId,
                                   @RequestBody AdmPlanarEquipRequests requests) throws Exception {
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         if(requests == null){
             throw new Exception("请求参数不能为空");
         }

+ 2 - 1
src/main/java/com/persagy/proxy/adm/controller/AdmRelationController.java

@@ -19,6 +19,7 @@ import com.persagy.proxy.adm.service.IAdmGraphicTypeService;
 import com.persagy.proxy.adm.service.IAdmRelationService;
 import com.persagy.proxy.adm.service.IAdmRelationTypeService;
 import com.persagy.proxy.adm.service.IAdmWindowService;
+import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +58,7 @@ public class AdmRelationController {
     @PostMapping("/equip/category")
     public AdmResponse equipRel(@QueryParam("projectId") String projectId) {
         //组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         AdmResponse res = service.query(context);
         return res;
     }

+ 2 - 1
src/main/java/com/persagy/proxy/adm/controller/AdmRelationObjectController.java

@@ -7,6 +7,7 @@ import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IAdmDtRelationService;
 import com.persagy.proxy.adm.service.IAdmGraphicTypeService;
+import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -40,7 +41,7 @@ public class AdmRelationObjectController {
     @PostMapping("/equip/query")
     public AdmResponse equipRel(@QueryParam("projectId") String projectId) {
         //组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         AdmQueryCriteria criteria = new AdmQueryCriteria();
         criteria.setFilters("projectId = "+projectId);
         AdmResponse admResponse = service.doQuery(context, criteria, AdmDtRelation.class);

+ 6 - 5
src/main/java/com/persagy/proxy/adm/controller/AdmVirtualWallController.java

@@ -7,6 +7,7 @@ import com.persagy.proxy.adm.request.AdmCreateRequest;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IAdmVirtualWallService;
+import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -41,7 +42,7 @@ public class AdmVirtualWallController {
     @PostMapping("/create")
     public AdmResponse create(@RequestBody AdmCreateRequest<AdmVirtualWall> createRequest, @QueryParam("projectId") String projectId) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         List<AdmVirtualWall> vos = CollUtil.newArrayList(createRequest.getContent());
         vos = service.doInsert(context, AdmVirtualWall.class, vos);
         return AdmResponse.success(vos);
@@ -56,7 +57,7 @@ public class AdmVirtualWallController {
     @PostMapping("/create_ignore")
     public AdmResponse createIgnore(@RequestBody AdmCreateRequest<AdmVirtualWall> createRequest, @QueryParam("projectId") String projectId) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         createRequest.getContent().forEach(it->{
             //TODO
         });
@@ -86,7 +87,7 @@ public class AdmVirtualWallController {
     @PostMapping("/update")
     public AdmResponse update(@RequestBody AdmCreateRequest<AdmVirtualWall> createRequest, @QueryParam("projectId") String projectId) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         List<AdmVirtualWall> vos = CollUtil.newArrayList(createRequest.getContent());
         vos = service.doUpdate(context, AdmVirtualWall.class, vos);
         return AdmResponse.success(vos);
@@ -103,7 +104,7 @@ public class AdmVirtualWallController {
     public AdmResponse query(@QueryParam("projectId") String projectId,
                              @RequestBody AdmQueryCriteria request) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         request.setName("equipment");
         request.setFilters("classCode = 'VIRTUALWALL'");
         return service.doQuery(context, request, AdmVirtualWall.class);
@@ -120,7 +121,7 @@ public class AdmVirtualWallController {
     public AdmResponse count(@QueryParam("projectId") String projectId,
                              @RequestBody AdmQueryCriteria request) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         request.setName("equipment");
         request.setOnlyCount(true);
         return service.doQuery(context, request, AdmVirtualWall.class);

+ 6 - 5
src/main/java/com/persagy/proxy/adm/controller/AdmWindowController.java

@@ -7,6 +7,7 @@ import com.persagy.proxy.adm.request.AdmCreateRequest;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IAdmWindowService;
+import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -41,7 +42,7 @@ public class AdmWindowController {
     @PostMapping("/create")
     public AdmResponse create(@RequestBody AdmCreateRequest<AdmWindow> createRequest, @QueryParam("projectId") String projectId) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         List<AdmWindow> vos = CollUtil.newArrayList(createRequest.getContent());
         vos = service.doInsert(context, AdmWindow.class, vos);
         return AdmResponse.success(vos);
@@ -56,7 +57,7 @@ public class AdmWindowController {
     @PostMapping("/create_ignore")
     public AdmResponse createIgnore(@RequestBody AdmCreateRequest<AdmWindow> createRequest, @QueryParam("projectId") String projectId) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         createRequest.getContent().forEach(request->{
             //TODO
         });
@@ -86,7 +87,7 @@ public class AdmWindowController {
     @PostMapping("/update")
     public AdmResponse update(@RequestBody AdmCreateRequest<AdmWindow> createRequest, @QueryParam("projectId") String projectId) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         List<AdmWindow> vos = CollUtil.newArrayList(createRequest.getContent());
         vos = service.doUpdate(context, AdmWindow.class, vos);
         return AdmResponse.success(vos);
@@ -103,7 +104,7 @@ public class AdmWindowController {
     public AdmResponse query(@QueryParam("projectId") String projectId,
                              @RequestBody AdmQueryCriteria request) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         request.setName("equipment");
         request.setFilters("classCode = 'CFBEWN'");
         return service.doQuery(context, request, AdmWindow.class);
@@ -120,7 +121,7 @@ public class AdmWindowController {
     public AdmResponse count(@QueryParam("projectId") String projectId,
                              @RequestBody AdmQueryCriteria request) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         request.setName("equipment");
         request.setOnlyCount(true);
         return service.doQuery(context, request, AdmWindow.class);