fix(去除api包common-model依赖):

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/element/business/IEnvElementBusiness.java

@@ -33,26 +33,26 @@ public interface IEnvElementBusiness {
      * @param searchDTO
      * @return
      */
-    Result<List<ElementUserRelRespVo>> userRelPage(SearchDTO searchDTO);
+    Page<ElementUserRelRespVo> userRelPage(SearchDTO searchDTO);
 
     /**
      * 保存用户关联关系
      * @param relSaveVo
      * @return
      */
-    Result<Object> userRelSave(ElementUserSaveVo relSaveVo);
+    ResponseStatus userRelSave(ElementUserSaveVo relSaveVo);
 
     /**
      * 删除用户关联关系
      * @param id
      * @return
      */
-    Result<Object> deleteUserRel(String id);
+    ResponseStatus deleteUserRel(String id);
 
     /**
      * 非关联用户查询
      * @param searchDTO
      * @return
      */
-    Result<List<AuthUserVo>> notInUserRelPage(SearchDTO searchDTO);
+    Page<AuthUserVo> notInUserRelPage(SearchDTO searchDTO);
 }

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/element/business/impl/EnvElementBusiness.java

@@ -26,6 +26,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
@@ -93,7 +94,7 @@ public class EnvElementBusiness implements IEnvElementBusiness {
         if (null == element) {
             return ResponseStatus.fail("环境要素不存在");
         }
-        BeanUtils.copyProperties(envElementVo, element,"createUser", "createTime");
+        BeanUtils.copyProperties(envElementVo, element, "createUser", "createTime");
         envElementService.update(element);
         return ResponseStatus.success();
     }
@@ -106,23 +107,15 @@ public class EnvElementBusiness implements IEnvElementBusiness {
 
 
     @Override
-    public Result<List<ElementUserRelRespVo>> userRelPage(SearchDTO searchDTO) {
+    public Page<ElementUserRelRespVo> userRelPage(SearchDTO searchDTO) {
         Searchable searchable = Searchable.toSearchable(searchDTO);
         Condition elementIdCondition = searchable.getSearchFilter("elementId", SearchOperator.eq);
-        if (null == elementIdCondition) {
-            return Result.failMessage("请选择环境要素");
-        }
-
         // 暂时没有用户查询条件
         List<AuthUserInfo> userInfos = null;
-//        List<AuthUserInfo> userInfos = getSearchUsers(searchable);
-//        if (userInfos != null && userInfos.isEmpty()) {
-//            return Result.success(0L, Collections.emptyList());
-//        }
         String elementId = elementIdCondition.getValue().toString();
         Page<ElementUserRel> elementUserRels = getElementUserRels(searchable, elementId, userInfos);
         if (elementUserRels.isEmpty()) {
-            return Result.success(0L, Collections.emptyList());
+            return new PageImpl(new ArrayList());
         }
         // 用户查询为空再次查询用户
         if (null == userInfos) {
@@ -133,17 +126,19 @@ public class EnvElementBusiness implements IEnvElementBusiness {
                     .collect(Collectors.toList());
             userInfos = userInfoService.findByIds(userIds);
             if (CollectionUtils.isEmpty(userInfos)) {
-                return Result.success(0L, Collections.emptyList());
+                return new PageImpl(new ArrayList());
             }
         }
-        return getPageVos(elementUserRels, userInfos);
+        Result<List<ElementUserRelRespVo>> result = getPageVos(elementUserRels, userInfos);
+        return new PageImpl(result.getContent(), Pageable.unpaged(), result.getTotalElements());
+
     }
 
     @Override
-    public Result<Object> userRelSave(ElementUserSaveVo relSaveVo) {
+    public ResponseStatus userRelSave(ElementUserSaveVo relSaveVo) {
         List<String> userIds = relSaveVo.getUserIds();
         if (CollectionUtils.isEmpty(userIds)) {
-            return Result.success();
+            return ResponseStatus.success();
         }
         String elementId = relSaveVo.getElementId();
         List<ElementUserRel> collect = userIds.stream()
@@ -155,22 +150,19 @@ public class EnvElementBusiness implements IEnvElementBusiness {
                     return userRel;
                 }).collect(Collectors.toList());
         elementUserRelService.batchSave(collect);
-        return Result.success();
+        return ResponseStatus.success();
     }
 
     @Override
-    public Result<Object> deleteUserRel(String id) {
+    public ResponseStatus deleteUserRel(String id) {
         elementUserRelService.deleteById(id);
-        return Result.success();
+        return ResponseStatus.success();
     }
 
     @Override
-    public Result<List<AuthUserVo>> notInUserRelPage(SearchDTO searchDTO) {
+    public Page<AuthUserVo> notInUserRelPage(SearchDTO searchDTO) {
         Searchable searchable = Searchable.toSearchable(searchDTO);
         Condition elementIdCondition = searchable.getSearchFilter("elementId", SearchOperator.eq);
-        if (null == elementIdCondition) {
-            return Result.failMessage("请选择环境要素");
-        }
         searchable.removeSearchFilter("elementId", SearchOperator.eq);
         String elementId = elementIdCondition.getValue().toString();
         // 查询关联人员的id
@@ -180,10 +172,11 @@ public class EnvElementBusiness implements IEnvElementBusiness {
         }
         Page<AuthUserInfo> page = userInfoService.page(searchable);
         Page<AuthUserVo> copy = DcucBeanUtil.createCopyToObjectPage(page, AuthUserVo.class);
-        return new Result(ResultEnum.SUCCESS.getKey(), ResultEnum.SUCCESS.getValue(), copy.getTotalElements(),copy.getContent());
+        return copy;
     }
 
-    private Page<ElementUserRel> getElementUserRels(Searchable searchable, String elementId, List<AuthUserInfo> userInfos) {
+    private Page<ElementUserRel> getElementUserRels(Searchable searchable, String elementId,
+                                                    List<AuthUserInfo> userInfos) {
         Searchable relSearch = Searchable.newSearchable();
         relSearch.addSort(Sort.Direction.DESC, "createTime");
         relSearch.addSearchFilter("elementId", SearchOperator.eq, elementId);
@@ -198,7 +191,8 @@ public class EnvElementBusiness implements IEnvElementBusiness {
         return elementUserRelService.pageSearch(relSearch);
     }
 
-    private Result<List<ElementUserRelRespVo>> getPageVos(Page<ElementUserRel> userRelPage, List<AuthUserInfo> userInfos) {
+    private Result<List<ElementUserRelRespVo>> getPageVos(Page<ElementUserRel> userRelPage,
+                                                          List<AuthUserInfo> userInfos) {
         Map<String, AuthUserInfo> userInfoMap = userInfos
                 .stream()
                 .collect(Collectors.toMap(AuthUserInfo::getId, e -> e));

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/element/facade/EnvElementFacade.java

@@ -54,22 +54,22 @@ public class EnvElementFacade implements IEnvElementFacade {
 
 
     @Override
-    public Result<List<ElementUserRelRespVo>> userRelPage(SearchDTO searchDTO) {
+    public Page<ElementUserRelRespVo> userRelPage(SearchDTO searchDTO) {
         return envElementBusiness.userRelPage(searchDTO);
     }
 
     @Override
-    public Result<Object> userRelSave(ElementUserSaveVo relSaveVo) {
+    public ResponseStatus userRelSave(ElementUserSaveVo relSaveVo) {
         return envElementBusiness.userRelSave(relSaveVo);
     }
 
     @Override
-    public Result<Object> deleteUserRel(String id) {
+    public ResponseStatus deleteUserRel(String id) {
         return envElementBusiness.deleteUserRel(id);
     }
 
     @Override
-    public Result<List<AuthUserVo>> notInUserRelPage(SearchDTO searchDTO) {
+    public Page<AuthUserVo> notInUserRelPage(SearchDTO searchDTO) {
         return envElementBusiness.notInUserRelPage(searchDTO);
     }
 }