house 2.1 fix

app/controller/house/v2/house_analysis.js

@@ -9,9 +9,7 @@ class HouseAnalysisController extends Controller {
 
         const { ctx } = this;
         const input_params = ctx.request.body;
-        if (!input_params.city_code) {
-            ctx.failed('city_code error');
-        }
+
         let results = await ctx.service.house.v2.houseAnalysis.getHouseAnalysisByFilter(input_params);
         const format_rows = await ctx.service.house.v2.houseAnalysis.formatHouseAnalysis(results.results);
         results.results = format_rows;
@@ -52,9 +50,12 @@ class HouseAnalysisController extends Controller {
         const { ctx } = this;
         const input_params = ctx.request.body;
         const rule = {
-            name: { type: 'string', required: true },
+            name: { type: 'string', required: false },//2.1版本改动 废弃
             city_code: { type: 'string', required: true },
-            house_type: { type: 'string', required: true },
+            house_type: { type: 'string', required: false },//2.1版本改动 废弃
+            room_num: { type: 'string', required: true },//2.1 版本新增
+            hall_num: { type: 'string', required: true },//2.1 版本新增
+            toilet_num: { type: 'string', required: true },//2.1 版本新增
             area: { type: 'string', required: true },
             image: { type: 'string', required: true },
         }
@@ -64,6 +65,26 @@ class HouseAnalysisController extends Controller {
         ctx.success({ result });
     }
 
+    // async uploadHouseAnalysis_2_1() {
+
+    //     const { ctx } = this;
+    //     const input_params = ctx.request.body;
+    //     const rule = {
+    //         name: { type: 'string', required: false },
+    //         city_code: { type: 'string', required: true },
+    //         house_type: { type: 'string', required: false },
+    //         room_num: { type: 'string', required: false },
+    //         hall_num: { type: 'string', required: false },
+    //         toilet_num: { type: 'string', required: false },
+    //         area: { type: 'string', required: true },
+    //         image: { type: 'string', required: true },
+    //     }
+    //     ctx.validate(rule, input_params);
+    //     const result = await ctx.service.house.v2.houseAnalysis.addHouseAnalysis(input_params);
+
+    //     ctx.success({ result });
+    // }
+
     async getUserHouseAnalysis() {
 
         const { ctx } = this;

app/model/realestate/house_analysis.js

@@ -18,6 +18,9 @@ module.exports = app => {
         residential: STRING,
         city: STRING,
         house_type: STRING,
+        room_num: INTEGER,
+        hall_num: INTEGER,
+        toilet_num: INTEGER,
         house_area: STRING,
         image: STRING,
         text: STRING,

app/router/house.js

@@ -106,6 +106,7 @@ module.exports = app => {
     router.post('/v2/house_analysis/list', 'house.v2.houseAnalysis.getHouseAnalysisList');//户型解析列表
     router.get('/v2/house_analysis/info/:house_analysis_id', 'house.v2.houseAnalysis.getHouseAnalysisInfo');//户型解析列表
     router.post('/v2/house_analysis/', loginAuth, 'house.v2.houseAnalysis.uploadHouseAnalysis');//上传户型信息
+    // router.post('/v2.1/house_analysis/', loginAuth, 'house.v2.houseAnalysis.uploadHouseAnalysis_2_1');//上传户型信息
     router.get('/v2/house_analysis/mine', loginAuth, 'house.v2.houseAnalysis.getUserHouseAnalysis');//我的户型
     router.get('/v2/house_analysis/city_list', 'house.v2.houseAnalysis.getHouseAnalysisSupportCity');//上传户型解析的城市列表
 

app/service/house/v2/house_analysis.js

@@ -11,13 +11,22 @@ class HouseAnalysisService extends Service {
     async getHouseAnalysisByFilter(condition) {
 
         const { ctx } = this;
-        let { city_code, keyword, page, page_size } = condition;
+        let { city_code, keyword, page, page_size, room_num, hall_num, toilet_num } = condition;
         page = page ? page : 1;
         page_size = page_size ? page_size : 10;
         let where = { status: 'pass' };
         if (city_code) {
             where.city = city_code;
         }
+        if (room_num) {
+            where.room_num = room_num;
+        }
+        if (hall_num) {
+            where.hall_num = hall_num;
+        }
+        if (toilet_num) {
+            where.toilet_num = toilet_num;
+        }
         if (keyword && keyword.length !== 0) {
             where.residential = { $like: `%${keyword}%` }
         }
@@ -58,17 +67,23 @@ class HouseAnalysisService extends Service {
         if (!user_id || !app_user_id || !app_id || !app_type_id) {
             ctx.failed('login error');
         }
-
+        let { name, house_type, room_num, hall_num, toilet_num, city_code, area, image } = params;
+        if (!house_type) {
+            house_type = `${room_num}室${hall_num}厅${toilet_num}卫`;
+        }
         const data = {
             user_id,
             app_user_id,
             app_id,
             app_type_id,
-            residential: params.name,
-            house_type: params.house_type,
-            city: params.city_code,
-            house_area: params.area,
-            image: params.image,
+            residential: name,
+            house_type: house_type,
+            room_num,
+            hall_num,
+            toilet_num,
+            city: city_code,
+            house_area: area,
+            image: image,
             created_at: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
         }