Преглед на файлове

添加通过id查询企业信息接口

wangmh преди 7 години
родител
ревизия
b3aba4b6ac

+ 21 - 19
sso-common/src/main/java/com/uas/sso/util/AccountUtils.java

@@ -12,6 +12,7 @@ import com.uas.sso.support.Page;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -834,25 +835,26 @@ public class AccountUtils {
 		}
 		return result;
 	}
-//	/**
-//	 * 搜索词通过id返回数据
-//	 *
-//	 * @param ids
-//	 * @return
-//	 * @throws Exception
-//	 */
-//	public static List<UserSpaceDetail> findAll(String ids) throws Exception {
-//		String url = AccountConfig.getEnPartnersUrl();
-//		List<UserSpaceDetail> details = new ArrayList<UserSpaceDetail>();
-//		if (!StringUtils.isEmpty(url)) {
-//			ResponseWrap res = HttpUtil.doGet(url, new ModelMap("_operate", "findAll").addAttribute("ids", ids));
-//			if(!res.isSuccess())
-//				throw new Exception(res.getContent());
-//			else
-//				details = JSONObject.parseArray(res.getContent(), UserSpaceDetail.class);
-//		}
-//		return details;
-//	}
+	/**
+	 * 搜索词通过id返回数据
+	 *
+	 * @param ids
+	 * @return
+	 * @throws Exception
+	 */
+	public static List<UserSpaceView> findAll(String ids) throws Exception {
+		String url = AccountConfig.getSpaceSaveUrl();
+		List<UserSpaceView> details = new ArrayList<UserSpaceView>();
+		if (!StringUtils.isEmpty(url)) {
+			HttpUtil.ResponseWrap res = HttpUtil.doGet(url, new ModelMap("_operate", "findAll").addAttribute("ids", ids));
+			if(!res.isSuccess()) {
+                throw new Exception(res.getContent());
+            } else {
+                details = JSONObject.parseArray(res.getContent(), UserSpaceView.class);
+            }
+		}
+		return details;
+	}
 
 	/**
 	 * 通过企业营业执照查询收到的待处理的请求

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

@@ -150,18 +150,6 @@ public class PartnershipManagerController extends BaseController {
 		return partnershipService.getRequestByBusinessCode(custBusinessCode, vendBusinessCode);
 	}
 
-//	/**
-//	 * 通过id查询企业信息(方便平台搜索调用)
-//	 *
-//	 * @param ids
-//	 * @return
-//	 */
-//	@RequestMapping(params = "_operate=findAll")
-//	@ResponseBody
-//	public List<UserSpaceView> findAll(String ids) {
-//		return userSpaceService.findAll(ids);
-//	}
-
 	/**
 	 * 获取收到的待处理的请求的数量
 	 *
@@ -176,7 +164,7 @@ public class PartnershipManagerController extends BaseController {
 	/**
 	 * 邀请合作伙伴记录
 	 *
-	 * @param formStore
+	 * @param jsonStr
 	 */
 	@RequestMapping(params = "_operate=invitation", method = RequestMethod.POST)
 	@ResponseBody

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

@@ -609,4 +609,16 @@ public class UserspaceManagerController extends BaseController {
         userspaceService.register(userspace);
         return success();
     }
+
+    /**
+     * 通过id查询企业信息(方便平台搜索调用)
+     *
+     * @param ids
+     * @return
+     */
+    @RequestMapping(params = "_operate=findAll")
+    @ResponseBody
+    public List<Userspace> findAll(String ids) {
+        return userspaceService.findAll(ids);
+    }
 }

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

@@ -158,4 +158,11 @@ public interface UserspaceService {
     List<String> findRepeatName();
 
     List<Userspace> findAllBySpaceName(String name);
+
+    /**
+     * 根据id搜索企业信息
+     * @param ids
+     * @return
+     */
+    List<Userspace> findAll(String ids);
 }

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

@@ -337,4 +337,13 @@ public class UserspaceServiceImpl implements UserspaceService {
     public List<Userspace> findAllBySpaceName(String name) {
         return userspaceDao.findAllBySpaceName(name);
     }
+
+    @Override
+    public List<Userspace> findAll(String ids) {
+        List<Long> idList = JSONObject.parseArray(ids, Long.class);
+        if (!CollectionUtils.isEmpty(idList)) {
+            return userspaceDao.findAll(idList);
+        }
+        return Collections.emptyList();
+    }
 }