优化代码

platform-common/src/main/java/com/platform/service/impl/ZhiHouseService.java

@@ -1,7 +1,9 @@
 package com.platform.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.platform.enums.ResultCodeEnum;
 import com.platform.exception.CommonBaseException;
+import com.platform.vos.RequestScene;
 import com.platform.vos.ReturnDTO;
 import com.platform.vos.ZhiHouseUserLoginVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,4 +83,23 @@ public class ZhiHouseService {
         }
         return responseEntity.getBody();
     }
+
+    public JSONObject getSceneFromZhiHouse(RequestScene requestScene){
+        String url = zhiHouseHost + "scene/list";
+        if(org.apache.commons.lang3.StringUtils.isBlank(url )){
+            throw new CommonBaseException(ResultCodeEnum.D101 , "入参不全，无法获取四维场景列表");
+        }
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("token", requestScene.getToken());
+        HttpEntity<Object> formEntity = new HttpEntity<>(requestScene, headers);
+        ResponseEntity<ReturnDTO> responseEntity = restTemplate.postForEntity(url,formEntity,ReturnDTO.class);
+        if(responseEntity.getStatusCode()!= HttpStatus.OK){
+            throw new CommonBaseException(ResultCodeEnum.D100);
+        }
+        if (responseEntity.getBody().getCode() != 200) {
+            throw new CommonBaseException(ResultCodeEnum.D100,responseEntity.getBody().getError());
+        }
+        //把信息封装为json
+        return JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getBody().getMessage()));
+    }
 }

platform-shop/src/main/java/com/platform/controller/SceneController.java

@@ -12,6 +12,7 @@ import com.platform.service.BrandService;
 import com.platform.service.SceneService;
 import com.platform.service.SysDeptService;
 import com.platform.service.SysUserService;
+import com.platform.service.impl.ZhiHouseService;
 import com.platform.utils.*;
 import com.platform.vo.BrandBindUserVo;
 import com.platform.vos.CurrentUserLoginVo;
@@ -60,11 +61,8 @@ public class SceneController extends AbstractController{
     @Autowired
     private DepartmentUtils departmentUtils;
 
-    @Value("${scenePath}")
-    private String scenePath;
-
     @Autowired
-    private RestTemplate restTemplate;
+    private ZhiHouseService zhiHouseService;
 
     /**
      * 更新显示状态
@@ -86,8 +84,7 @@ public class SceneController extends AbstractController{
             requestScene.setToken(sceneParam.getToken());
             requestScene.setNums("'"+sceneParam.getSceneNum()+"'");
             requestScene.setUserId(-1L);
-            String url = scenePath + "scene/list";
-            JSONObject mySceneJsonData = getSceneFromKanKan(url , requestScene);
+            JSONObject mySceneJsonData = zhiHouseService.getSceneFromZhiHouse(requestScene);
             if(ObjectUtils.isEmpty(mySceneJsonData) || !mySceneJsonData.containsKey("list")){
                 log.error("场景码错误！");
                 return R.error("场景码错误！");
@@ -210,8 +207,7 @@ public class SceneController extends AbstractController{
                 requestScene.setPhone(user.getMobile());
             }
         }
-        String url = scenePath + "scene/list";
-        JSONObject mySceneJsonData = getSceneFromKanKan(url , requestScene);
+        JSONObject mySceneJsonData = zhiHouseService.getSceneFromZhiHouse(requestScene);
         if(ObjectUtils.isEmpty(mySceneJsonData) || !mySceneJsonData.containsKey("list")){
             return R.ok().put("page", null);
         }
@@ -254,41 +250,6 @@ public class SceneController extends AbstractController{
         return R.ok().put("page", mySceneJsonData);
     }
 
-    public JSONObject getSceneFromKanKan(String url , RequestScene requestScene){
-        if(org.apache.commons.lang3.StringUtils.isBlank(url )){
-            throw new CommonBaseException(ResultCodeEnum.D101 , "入参不全，无法获取四维场景列表");
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("token", requestScene.getToken());
-        HttpEntity<Object> formEntity = new HttpEntity<>(requestScene, headers);
-        ResponseEntity<String> kankanResult = restTemplate.postForEntity(url,formEntity,String.class);
-        //把信息封装为json
-        JSONObject res = JSONObject.parseObject(kankanResult.getBody());
-        return parseKanKanRsp(res);
-    }
-
-    public JSONObject parseKanKanRsp(JSONObject result){
-        if(null == result){
-            throw new CommonBaseException(ResultCodeEnum.D101 , "四维看看返回数据异常");
-        }
-        log.info("看看获取场景列表返回:{}", result.toJSONString());
-        int code = -10;
-        if (result.containsKey("code")) {
-            code = (int) result.get("code");
-            if (code != 200) {
-                throw new CommonBaseException(ResultCodeEnum.D101 , "调用四维看看失败");
-            }
-            JSONObject data =  result.getJSONObject("message");
-            if(null == data){
-                throw new CommonBaseException(ResultCodeEnum.D101 , "四维看看返回数据异常-缺data");
-            }
-
-            return data;
-        } else {
-            throw new CommonBaseException(ResultCodeEnum.D101 , "调用四维看看失败");
-        }
-    }
-
     /**
      * 查看信息
      */
@@ -308,8 +269,7 @@ public class SceneController extends AbstractController{
         requestScene.setToken(token);
         requestScene.setNums("'"+SceneEntity.getSceneNum()+"'");
         requestScene.setUserId(-1L);
-        String url = scenePath + "scene/list";
-        JSONObject mySceneJsonData = getSceneFromKanKan(url , requestScene);
+        JSONObject mySceneJsonData = zhiHouseService.getSceneFromZhiHouse(requestScene);
         if(ObjectUtils.isEmpty(mySceneJsonData) || !mySceneJsonData.containsKey("list")){
             return R.error("场景码错误！");
         }