Merge branch 'master' of http://116.63.33.55/git/zfjyjgfwpt

VirtualInterface/getHouseSourceBasicInfoById.json

@@ -1,62 +1 @@
-{
-  "uuid": "a24f7266a5b24fed83829e3492640cc7",
-  "type": "success",
-  "data": {
-    "houseInfo": {
-      "FWMS": "精装跃层两房",
-      "ZXQYH": "东海岸",
-      "QX": "渝北",
-      "CJJG": 12154545,
-      "FYHYM": "2022022112315151",
-      "GPSJ": "2012 - 05 - 12",
-      "HX": "一室一厅",
-      "JZMJ": "82.6",
-      "CHX": "东南",
-      "TNMJ": "75.4",
-      "ZXCD": "精装修",
-      "FWLX": "住宅",
-      "SZC": 6,
-      "ZCS": 12,
-      "JZSJ": "2012 - 05 - 12",
-      "HXJG": "平层",
-      "DYZT": 0,
-      "CFZT": 0,
-      "CZZHT": 0,
-      "XZZHT": 0,
-      "FBLX": "非独家",
-      "GRQCH": "张三",
-      "DWQCH": "重庆房地产开发有限公司",
-      "DJ": 14375,
-      "FLBQ": [
-        "住宅",
-        "精装修",
-        "东南"
-      ],
-      "GPJJRSL": 3,
-      "LINK": "https://cq.lianjia.com/ershoufang/106110417391.html"
-    },
-    "brokerInfo": {
-      "IMG": "http: //www.xxx.com/avatar.png",
-      "GRQCH": "张三",
-      "CYRYBH": "sadada44545",
-      "PJXX": 0,
-      "DWQCH": "重庆房地产开发有限公司",
-      "CJJG": 12154545,
-      "LXDH": "13891234567",
-      "LINK": "https://cq.lianjia.com"
-    },
-    "otherBrokerInfo": [
-      {
-        "IMG": "http: //www.xxx.com/avatar.png",
-        "GRQCH": "张三",
-        "CYRYBH": "4545afewfwf",
-        "PJXX": 0,
-        "DWQCH": "重庆房地产开发有限公司",
-        "CJJG": 12154545,
-        "LXDH": "13891234567",
-        "LINK": "https://cq.lianjia.com",
-        "GPSJ": "2020-01-01 09:00:00"
-      }
-    ]
-  }
-}
+{"data":{"brokerInfo":{"IMG":"","CYRYBH":"","PJXX":""},"otherBrokerInfo":[],"houseInfo":{"CFZT":"","DJ":61.3879987,"ZCS":33,"JZMJ":90.49,"CZZHT":"","FWMS":"","GPSJ":"2021-08-05","XZZHT":"","FYZP":"","FBLX":"","FYHYM":"2111080200085","DYZT":"","TNMJ":69.56,"GPJJRSL":"","ZL":"重庆市茶亭路49号北部湾壹号雅苑海馨阁3006号","ZXCD":"","FLBQ":"","CJJG":5555.0,"FWLX":"住宅","SZC":30}},"type":"success","uuid":"6f083a827fc54507af8b7b9f97f7f760"}

VirtualInterface/houseSourceVerify.json

@@ -0,0 +1 @@
+{"data":{"houseInfo":{"CFZT":"","DJ":61.3879987,"ZCS":33,"JZMJ":90.49,"CZZHT":"","FWMS":"","PJXX":"","GPSJ":"2021-08-05","CYRYBH":"","XZZHT":"","FYZP":"","FBLX":"","FYHYM":"2111080200085","DYZT":"","TNMJ":69.56,"GPJJRSL":"","ZL":"重庆市茶亭路49号北部湾壹号雅苑海馨阁3006号","ZXCD":"","FLBQ":"","CJJG":5555,"FWLX":"住宅","SZC":30}},"type":"success","uuid":"8e31e8e6596449888916d2466aa4a32f"}

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

@@ -117,7 +117,7 @@ public class FrontServiceImpl implements FrontServiceI {
 
     @Override
     public ApiResponse<?> houseSourceVerify(String FYHYM) {
-        String resStr = "{\"data\":{\"houseInfo\":{\"CFZT\":\"\",\"CZZHT\":\"\",\"FWMS\":\"\",\"PJXX\":\"\",\"GPSJ\":\"2021-08-17\",\"CYRYBH\":\"\",\"XZZHT\":\"\",\"FYZP\":\"\",\"FBLX\":\"\",\"FYHYM\":\"2021081700004\",\"DYZT\":\"\",\"GPJJRSL\":\"\",\"ZXCD\":\"\",\"FLBQ\":\"\"}},\"type\":\"success\",\"uuid\":\"f126114c8e7c428394a65ced3179a520\"}";
+        String resStr = loadLocalJsonFile("houseSourceVerify");;
 //        JSONObject params = new JSONObject();
 //        params.put("FYHYM", FYHYM);
 //        HttpResponse response = HttpUtil.createGet(RemoteUrlConstants.houseSourceVerify())
@@ -721,13 +721,13 @@ public class FrontServiceImpl implements FrontServiceI {
 
     @Override
     public ApiResponse<?> getHouseSourceBasicInfoById(Map<String, Object> params) {
-//        String resString = "{\"data\":{\"houseInfo\":{\"CFZT\":\"\",\"CZZHT\":\"\",\"FWMS\":\"\",\"PJXX\":\"\",\"GPSJ\":\"2021-08-17\",\"CYRYBH\":\"\",\"XZZHT\":\"\",\"FYZP\":\"\",\"FBLX\":\"\",\"FYHYM\":\"2021081700004\",\"DYZT\":\"\",\"GPJJRSL\":\"\",\"ZXCD\":\"\",\"FLBQ\":\"\"}},\"type\":\"success\",\"uuid\":\"f126114c8e7c428394a65ced3179a520\"}";
         String resStr = loadLocalJsonFile("getHouseSourceBasicInfoById");
-        // TODO: 2022/3/28 接口地址待定
-        HttpResponse response = HttpUtil.createGet(RemoteUrlConstants.getHouseSourceBasicInfoById())
-                .form(params)
-                .execute();
-        JSONObject resObj = JSONObject.parseObject(response.body());
+        JSONObject resObj = JSONObject.parseObject(resStr);
+
+//        HttpResponse response = HttpUtil.createGet(RemoteUrlConstants.getHouseSourceBasicInfoById())
+//                .form(params)
+//                .execute();
+//        JSONObject resObj = JSONObject.parseObject(response.body());
         if (ObjectUtil.isNull(resObj)) {
             return ApiResponse.failed();
         }

src/main/resources/static/main/tradingranking.html

@@ -260,7 +260,7 @@
 					page: 1,
 					limit: 20,
 					mechData: mechData,
-					preData: "",
+					preData: [],
 					loading: "",
 					// preData: ,
 					// 中心城区