建发社区接口优化

src/main/java/com/ikonke/konkeaialibabamcp/controller/CDCController.java

@@ -159,7 +159,7 @@ public class CDCController {
 
 	@GetMapping("/getSpacesList")
 	public JSONArray getSpacesList(@RequestParam(name = "sn") String sn){
-		log.info("getSpacesList..获取空间列表..sn:{}",sn);
+		log.info("【{}】getSpacesList..获取空间列表..",sn);
 		JSONArray all = spacesService.findAll(sn);
 		if(!all.isEmpty()){
 			return all;

src/main/java/com/ikonke/konkeaialibabamcp/service/SycDeviceService.java

@@ -51,7 +51,10 @@ public class SycDeviceService {
 
 	public JSONArray findDeviceByName2(String ccuName,JSONArray param){
 		long start = System.currentTimeMillis();
-
+		JSONArray jsonArray = new JSONArray();
+		if(StrUtil.isBlank(ccuName) || param.isEmpty()){
+			return null;
+		}
 		QueryWrapper<SynDevice> wrapper = new QueryWrapper<>();
 		wrapper.eq("ccuId", ccuName);
 
@@ -71,7 +74,7 @@ public class SycDeviceService {
 		});
 
 		List<SynDevice> list = synDeviceService.list(wrapper);
-		JSONArray jsonArray = new JSONArray();
+
 		if(!list.isEmpty()){
 			for (SynDevice synDevice : list) {
 				JSONObject jsonObject = new JSONObject();

src/main/java/com/ikonke/konkeaialibabamcp/service/cdc/CdcHttpUtils.java

@@ -60,7 +60,7 @@ public class CdcHttpUtils {
 	 *
 	 */
 	public UserEntity getOwner(CDCToken bySn){
-		log.info("去建发获取业主信息,sn:{},ccu:{}",bySn.getSn(),bySn.getCcuId());
+		log.info("【{}】去建发获取业主信息,ccu:{}",bySn.getSn(),bySn.getCcuId());
 		if(CDCTokenCache.get(bySn.getSn())!=null){
 			String s = CDCTokenCache.get(bySn.getSn());
 			return JSONUtil.toBean(s, UserEntity.class);
@@ -88,9 +88,13 @@ public class CdcHttpUtils {
 	 */
 	public String get(String url, String sn) {
 		long start = System.currentTimeMillis();
-		log.info("建发get请求：url：{}，sn:{}",url, sn);
+		log.info("【{}】建发get请求：url：{}",sn,url);
 		CDCToken bySn = tokenService.findBySn(sn);
 		UserEntity userEntity = getOwner(bySn);
+		if(userEntity==null){
+			log.info("【{}】获取用户信息失败",sn);
+			return null;
+		}
 		String body = HttpRequest.get(url)
 				.header("X-token",bySn.getAccessToken())
 				.header("gateway-id",bySn.getCcuId())
@@ -103,15 +107,19 @@ public class CdcHttpUtils {
 				.header("Propertyid",userEntity.communityId)
 				.timeout(20000)//超时，毫秒
 				.execute().body();
-		log.info("建发get请求结果：url：{}，sn:{},body:{},耗时：{}",url, sn,body,System.currentTimeMillis()-start);
+		log.info("【{}】建发get请求结果：url：{},body:{},耗时：{}",sn,url,body,System.currentTimeMillis()-start);
 		return body;
 	}
 
 	public String post(String url, String sn,String body) {
 		long start = System.currentTimeMillis();
-		log.info("建发post请求：url：{}，sn:{},body:{}",url, sn,body);
+		log.info("【{}】建发post请求：url：{},body:{}",sn,url,body);
 		CDCToken bySn = tokenService.findBySn(sn);
 		UserEntity userEntity = getOwner(bySn);
+		if(userEntity==null){
+			log.info("【{}】获取用户信息失败",sn);
+			return null;
+		}
 		String result = HttpRequest.post(url)
 				.header("X-token",bySn.getAccessToken())
 				.header("gateway-id",bySn.getCcuId())
@@ -125,7 +133,7 @@ public class CdcHttpUtils {
 				.body(body)
 				.timeout(20000)
 				.execute().body();
-		log.info("建发post请求结果：url：{}，sn:{},body:{},耗时：{}",url, sn,result,System.currentTimeMillis()-start);
+		log.info("【{}】建发post请求结果：url：{},body:{},耗时：{}",sn,url,result,System.currentTimeMillis()-start);
 		return result;
 	}
 }

src/main/java/com/ikonke/konkeaialibabamcp/service/cdc/spaces/SpacesService.java

@@ -58,6 +58,9 @@ public class SpacesService {
 	public JSONArray findAll(String sn) {
 		// 小区功能区列表
 		String s = cdcHttpUtils.get(getListSpacesRoomUrl, sn);
+		if (s == null){
+			throw new StatefulException(51, "查询会所空间列表失败");
+		}
 		JSONObject spacesJson = new JSONObject(s);
 		if(spacesJson.getInt("code") != 200){
 			throw new StatefulException(51, "查询会所空间列表失败");