对接v20220413、v20220414接口

src/main/java/com/jd/zfjyjgfwpt/configer/RemoteUrlConstants.java

@@ -165,6 +165,17 @@ public class RemoteUrlConstants {
      */
     private static final String SEARCH_COMMUNITY_IN_AREA_URL = "/dsj-mhwz-gjxqtjfysl";
 
+    /**
+     * 根据公司ID查询公司门店信息列表
+     * GET
+     */
+    private static final String SEARCH_STORES_INFO_URL = "/dsj-mhwz-hqmdxxlb";
+
+    /**
+     * 获取当前登录人员挂牌列表
+     * GET
+     */
+    private static final String SEARCH_LOGIN_USER_LISTING_URL = "/dsj-mhwz-dqdlrgplb";
 
     public static String getPrefix() {
         return PREFIX;
@@ -269,4 +280,12 @@ public class RemoteUrlConstants {
     public static String getCommunityInArea() {
         return PREFIX2 + SEARCH_COMMUNITY_IN_AREA_URL;
     }
+
+    public static String getStores() {
+        return PREFIX2 + SEARCH_STORES_INFO_URL;
+    }
+
+    public static String getLoginUserListing() {
+        return PREFIX2 + SEARCH_LOGIN_USER_LISTING_URL;
+    }
 }

src/main/java/com/jd/zfjyjgfwpt/controller/FrontController.java

@@ -793,6 +793,7 @@ public class FrontController extends BaseController {
      * @param limit 每页展示记录数
      * @param ID    当前人员id
      * @param type  1：自主挂牌，2：委托挂牌
+     * @Date 2022-04-14
      */
     @GetMapping("getCurrLoginPersonListingList")
     public void getCurrLoginPersonListingList(Integer page, Integer limit, String ID, String type) {
@@ -804,13 +805,14 @@ public class FrontController extends BaseController {
         params.put("limit", limit);
         params.put("ID", ID);
         params.put("type", type);
-        writeJson(service.getCurrLoginPersonListingList(params));
+        sendJson(service.getCurrLoginPersonListingList(params));
     }
 
     /**
      * 根据公司ID查询公司门店信息列表
      *
      * @param companyId 公司id
+     * @Date 2022-04-14
      */
     @PostMapping("getCompanyStoreInfoListById")
     public void getCompanyStoreInfoListById(Integer page, Integer limit, String companyId, String area, String search) {
@@ -823,8 +825,7 @@ public class FrontController extends BaseController {
         params.put("companyId", companyId);
         params.put("area", area);
         params.put("search", search);
-        final PagingResponse<Object> pagingResponse = service.getCompanyStoreInfoListById(params);
-        writeJson(pagingResponse);
+        writeJson(service.getCompanyStoreInfoListById(params));
     }
 
     @PostMapping("appraise")

src/main/java/com/jd/zfjyjgfwpt/service/FrontServiceI.java

@@ -143,9 +143,9 @@ public interface FrontServiceI {
 
     Map<String, Object> getBrokerPersonListingList(Map<String, Object> params);
 
-    PagingResponse<Object> getCurrLoginPersonListingList(Map<String, Object> params);
+    Map<String, Object> getCurrLoginPersonListingList(Map<String, Object> params);
 
-    PagingResponse<Object> getCompanyStoreInfoListById(Map<String, Object> params);
+    Map<String, Object> getCompanyStoreInfoListById(Map<String, Object> params);
 
     /**
      * 评价

src/main/java/com/jd/zfjyjgfwpt/service/impl/FrontServiceImpl.java

@@ -324,7 +324,7 @@ public class FrontServiceImpl implements FrontServiceI {
             return SendUtil.send(true, "", data);
         }
 
-        return SendUtil.send(false, "", null);
+        return SendUtil.send(false, obj.getString("data"), null);
     }
 
     @Override
@@ -776,54 +776,42 @@ public class FrontServiceImpl implements FrontServiceI {
             return SendUtil.layuiTable(obj.getJSONObject("data").getInteger("count"), obj.getJSONObject("data").getJSONArray("data"));
         }
 
-        return SendUtil.send(false, "", null);
+        return SendUtil.send(false, obj.getString("data"), null);
     }
 
     @Override
-    public PagingResponse<Object> getCurrLoginPersonListingList(Map<String, Object> params) {
-        String resStr = loadLocalJsonFile("getCurrLoginPersonListingList");
-        JSONObject resObj = JSONObject.parseObject(resStr);
-
-        // TODO: 2022/3/28 接口地址待定
-        // HttpResponse response = HttpUtil.createGet("")
-        //         .form(params)
-        //         .execute();
-        // JSONObject resObj = JSONObject.parseObject(response.body());
-        if (ObjectUtil.isNull(resObj)) {
-            return PagingResponse.failed();
+    public Map<String, Object> getCurrLoginPersonListingList(Map<String, Object> params) {
+//        String resStr = loadLocalJsonFile("getCurrLoginPersonListingList");
+        String resStr = HttpUtil.get(RemoteUrlConstants.getLoginUserListing(), params);
+        if (Blank.isEmpty(resStr)) {
+            SendUtil.layuiTable(0, null);
         }
-        if (!"success".equals(resObj.getString("type"))) {
-            return PagingResponse.failed();
+
+        logger.info("getCurrLoginPersonListingList response body: {}", resStr);
+        JSONObject obj = JSONObject.parseObject(resStr);
+        if (StrUtil.equals(obj.getString("type"), "success", true)) {
+            JSONObject data = obj.getJSONObject("data");
+            SendUtil.layuiTable(data.getInteger("count"), data.getJSONArray("houseList"));
         }
-        JSONObject data = resObj.getJSONObject("data");
-        int count = data.getIntValue("count");
-        JSONArray jsonArr = data.getJSONArray("data");
-        logger.info("response body: {}", resObj.toJSONString());
-        return PagingResponse.success(count, jsonArr.toJavaList(Object.class));
+
+        return SendUtil.layuiTable(0, null);
     }
 
     @Override
-    public PagingResponse<Object> getCompanyStoreInfoListById(Map<String, Object> params) {
-//        String resStr = "{\"data\":{\"data\":[{\"DWQCH\":\"重庆链家房产经纪有限公司\",\"updateTime\":\"2022-03-24\",\"FYSL\":15}],\"count\":1},\"type\":\"success\",\"uuid\":\"0020a364a5014dd384716b76802de110\"}";
-        String resStr = loadLocalJsonFile("getCompanyStoreInfoListById");
-        JSONObject resObj = JSONObject.parseObject(resStr);
-
-        // TODO: 2022/3/28 接口地址待定
-        // HttpResponse response = HttpUtil.createGet("")
-        //         .form(params)
-        //         .execute();
-        // JSONObject resObj = JSONObject.parseObject(response.body());
-        if (ObjectUtil.isNull(resObj)) {
-            return PagingResponse.failed();
+    public Map<String, Object> getCompanyStoreInfoListById(Map<String, Object> params) {
+//        String resStr = loadLocalJsonFile("getCompanyStoreInfoListById");
+        String resStr = HttpUtil.get(RemoteUrlConstants.getStores(), params);
+        if (Blank.isEmpty(resStr)) {
+            return SendUtil.layuiTable(0, null);
         }
-        if (!"success".equals(resObj.getString("type"))) {
-            return PagingResponse.failed();
+
+        logger.info("getCompanyStoreInfoListById response body: {}", resStr);
+        JSONObject obj = JSONObject.parseObject(resStr);
+        if (StrUtil.equals(obj.getString("type"), "success", true)) {
+            JSONObject data = obj.getJSONObject("data");
+            return SendUtil.layuiTable(data.getInteger("count"), data.getJSONObject("data"));
         }
-        JSONObject data = resObj.getJSONObject("data");
-        int count = data.getIntValue("count");
-        JSONArray jsonArr = data.getJSONArray("data");
-        logger.info("response body: {}", resObj.toJSONString());
-        return PagingResponse.success(count, jsonArr.toJavaList(Object.class));
+        return SendUtil.layuiTable(0, null);
     }
 
     @Override