企业名允许重复，添加企业名模糊搜索，根据企业名查找企业

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

@@ -8,9 +8,8 @@ import com.uas.sso.util.FileUrl;
 import com.uas.sso.util.HttpUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -98,6 +97,22 @@ public class UserspaceManageController extends BaseController {
         return error("上传失败");
     }
 
+    @RequestMapping(value = "/search/name", method = RequestMethod.GET)
+    public ModelMap searchName(String keyword, @RequestParam(defaultValue = "5") int number) {
+        if (StringUtils.isEmpty(keyword)) {
+            return success();
+        }
+        return success(userspaceService.searchName(keyword, number));
+    }
+
+    @RequestMapping(value = "/info/name", method = RequestMethod.GET)
+    public ModelMap findByName(String name) {
+        if (StringUtils.isEmpty(name)) {
+            return success();
+        }
+        return success(userspaceService.findBySpaceName(name));
+    }
+
     /**
      * 统计申请已审批和未审批数量
      * @param spaceUU 企业uu号

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

@@ -15,11 +15,10 @@ public interface ApplyUserSpaceService {
     /**
      * 用户申请绑定企业
      *
-     * @param mobile 手机号
-     * @param spaceName 企业名称
-     * @param businessCode 企业营业执照号
+     * @param userUU 用户uu号
+     * @param spaceUU 企业uu号
      */
-    void applyBindUserSpace(String mobile, String spaceName, String businessCode);
+    void applyBindUserSpace(Long userUU, Long spaceUU);
 
     /**
      * 根据企业营业执照号找到申请企业的申请

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

@@ -4,6 +4,8 @@ import com.uas.sso.entity.User;
 import com.uas.sso.entity.Userspace;
 import org.springframework.data.domain.Page;
 
+import java.util.Set;
+
 /**
  * 企业service
  *
@@ -79,4 +81,19 @@ public interface UserspaceService {
      * @return 企业信息
      */
     Userspace findOne(Long spaceUU);
+
+    /**
+     * 查询企业名称
+     * @param keyword
+     * @param number
+     * @return
+     */
+    Page<String> searchName(String keyword, Integer number);
+
+    /**
+     * 根据企业名查询企业
+     * @param spaceName 企业名称
+     * @return
+     */
+    Set<Userspace> findBySpaceName(String spaceName);
 }

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

@@ -23,10 +23,7 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 /**
@@ -53,15 +50,15 @@ public class ApplyUserSpaceServiceImpl implements ApplyUserSpaceService {
     private AppService appService;
 
     @Override
-    public void applyBindUserSpace(String mobile, String spaceName, String businessCode) {
+    public void applyBindUserSpace(Long userUU, Long spaceUU) {
         // 找到用户信息
-        User user = userDao.findByMobile(mobile);
+        User user = userDao.findOne(userUU);
         if (user == null) {
             throw new VisibleError("手机号未注册");
         }
 
         // 找到企业信息
-        Userspace userspace = userspaceDao.findBySpaceName(spaceName);
+        Userspace userspace = userspaceDao.findOne(spaceUU);
         if (userspace == null) {
             throw new VisibleError("该企业未注册");
         }

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

@@ -21,12 +21,16 @@ import com.uas.sso.util.ChineseUtils;
 import com.uas.sso.util.ExecuteUtils;
 import com.uas.sso.util.StringUtil;
 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.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 企业信息service层
@@ -166,16 +170,16 @@ public class UserspaceServiceImpl implements UserspaceService {
 
     @Override
     public void checkSpaceName(String spaceName) {
-        Userspace userspace = userspaceDao.findBySpaceName(spaceName);
-        if (userspace != null) {
+        Set<Userspace> userSpaces = userspaceDao.findBySpaceName(spaceName);
+        if (CollectionUtils.isEmpty(userSpaces)) {
             throw new VisibleError("该企业名称已被注册，请确认");
         }
     }
 
     @Override
     public void checkBusinessCode(String businessCode) {
-        Userspace userspace = userspaceDao.findByBusinessCode(businessCode);
-        if (userspace != null) {
+        Set<Userspace> userSpaces = userspaceDao.findByBusinessCode(businessCode);
+        if (CollectionUtils.isEmpty(userSpaces)) {
             throw new VisibleError("该企业营业执照已被注册，请确认");
         }
     }
@@ -218,4 +222,17 @@ public class UserspaceServiceImpl implements UserspaceService {
     public Userspace findOne(Long spaceUU) {
         return userspaceDao.findOne(spaceUU);
     }
+
+    @Override
+    public Page<String> searchName(String keyword, Integer number) {
+        Pageable pageable = new PageRequest(0, number);
+        Page<String> pUserSpaces = userspaceDao.findByPageInfo(keyword, pageable);
+        return pUserSpaces;
+    }
+
+    @Override
+    public Set<Userspace> findBySpaceName(String spaceName) {
+        userspaceDao.findBySpaceName(spaceName);
+        return null;
+    }
 }