添加根据keyword查询企业接口

sso-manage-console/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8090
+  port: 8082
   tomcat:
     # Print tomcat access logs.
     basedir: logs/tomcat

sso-server/src/main/java/com/uas/sso/controller/PartnershipManagerController.java

@@ -68,15 +68,6 @@ public class PartnershipManagerController extends BaseController {
 //			return partnershipService.findBySpaceUidAndStatusCodeFilterByPartnerUUs(businessCode, statusCode, keyword, UUs, pageNumber, pageSize);
 //		}
 //		return partnershipService.findBySpaceUidAndStatusCode(businessCode, statusCode, keyword, pageNumber, pageSize);
-//	}
-//
-//	/**
-//	 * 查询所有企业列表
-//	 */
-//	@RequestMapping(params = "_operate=getUserSpaces")
-//	@ResponseBody
-//	public Page<UserSpaceDetail> getUserSpaces(String keyword, int pageNumber, int pageSize) {
-//		return userSpaceService.findByKeyword(keyword, pageNumber, pageSize);
 //	}
 
 	/**

sso-server/src/main/java/com/uas/sso/controller/UserspaceManagerController.java

@@ -8,7 +8,6 @@ import com.uas.account.entity.AppCreateInfo;
 import com.uas.account.entity.MasterInfo;
 import com.uas.account.entity.UserSpace;
 import com.uas.account.entity.UserSpaceDetail;
-import com.uas.account.support.Page;
 import com.uas.sso.common.util.HttpUtil;
 import com.uas.sso.core.Const;
 import com.uas.sso.core.Status;
@@ -23,6 +22,7 @@ import com.uas.sso.util.FastjsonUtils;
 import com.uas.sso.util.FileUrl;
 import com.uas.sso.util.HttpUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -184,6 +184,14 @@ public class UserspaceManagerController extends BaseController {
         return success(userspaceService.findOne(spaceUU));
     }
 
+    /**
+     * 查询所有企业列表
+     */
+    @RequestMapping(params = "_operate=getUserSpaces")
+    public Page<Userspace> getUserSpaces(String keyword, @RequestParam(defaultValue = "1") int pageNumber, @RequestParam(defaultValue = "20") int pageSize) {
+        return userspaceService.findByKeyword(keyword, pageNumber, pageSize);
+    }
+
     /**
      * 统计申请已审批和未审批数量
      * @param spaceUU 企业uu号

sso-server/src/main/java/com/uas/sso/service/UserspaceService.java

@@ -153,4 +153,13 @@ public interface UserspaceService {
      * @param afterAdmin
      */
     void changeAdmin(Userspace space, User afterAdmin);
+
+    /**
+     * 根据关键字查询企业信息
+     * @param keyword
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    Page<Userspace> findByKeyword(String keyword, int pageNumber, int pageSize);
 }

sso-server/src/main/java/com/uas/sso/service/impl/UserServiceImpl.java

@@ -312,7 +312,7 @@ public class UserServiceImpl implements UserService {
         userLog.info(user, Type.UPDATE_MOBILE.getValue());
 
         // 同步到各个应用
-        syncUserInfo(user.getUserUU(), null, "个人注册");
+        syncUserInfo(user.getUserUU(), null, "修改手机号");
     }
 
     @Override

sso-server/src/main/java/com/uas/sso/service/impl/UserspaceServiceImpl.java

@@ -18,10 +18,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import javax.persistence.criteria.*;
 import java.sql.Timestamp;
 import java.util.*;
 
@@ -340,4 +342,27 @@ public class UserspaceServiceImpl implements UserspaceService {
 
         syncUserSpaceInfo(space.toView(), "更换管理员");
     }
+
+    @Override
+    public Page<Userspace> findByKeyword(final String keyword, int pageNumber, int pageSize) {
+        Pageable pageable = PageInfo.pageRequest(pageNumber, pageSize);
+        Page<Userspace> page = userspaceDao.findAll(new Specification<Userspace>() {
+            @Override
+            public Predicate toPredicate(Root<Userspace> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+                List<Predicate> keyPredicates = new ArrayList<>();
+                // 模糊查询企业名称，营业执照号，注册地址，管理员姓名
+                keyPredicates.add(cb.like(cb.upper(root.get("spaceName").as(String.class)), "%" + keyword.toUpperCase() + "%"));
+                keyPredicates.add(cb.like(cb.upper(root.get("businessCode").as(String.class)), "%" + keyword.toUpperCase() + "%"));
+                keyPredicates.add(cb.like(cb.upper(root.get("regAddress").as(String.class)), "%" + keyword.toUpperCase() + "%"));
+                keyPredicates.add(cb.like(cb.upper(root.join("admin", JoinType.INNER).get("vipName").as(String.class)), "%" + keyword.toUpperCase() + "%"));
+
+                Predicate[] predicates = new Predicate[keyPredicates.size()];
+                query.where(cb.or(keyPredicates.toArray(predicates)));
+                query.orderBy(cb.desc(root.get("registerDate").as(Integer.class)));
+
+                return query.getRestriction();
+            }
+        }, pageable);
+        return new PageInfo<Userspace>(page.getContent(), pageable, page.getTotalElements());
+    }
 }