house v2 tool fix

app/model/block/house_price_city.js

+'use strict';
+module.exports = app => {
+  const { STRING, INTEGER } = app.Sequelize;
+
+  const HousePriceCity = app.blockModel.define('house_price_city', {
+    id: {
+      type: INTEGER,
+      allowNull: false,
+      primaryKey: true,
+      autoIncrement: true,
+    },
+    price: INTEGER,
+  }, {
+    timestamps: false,
+    tableName: 'house_price_city',
+    freezeTableName: true,
+  });
+
+  HousePriceCity.one = async (data) => {
+    const attributes = data.attributes ? data.attributes : {};
+    const where = data.where ? data.where : {};
+    return await HousePriceCity.findOne({
+      attributes: attributes,
+      where : where,
+    });
+  }
+
+
+  HousePriceCity.all = async (data) => {
+    const attributes = data.attributes ? data.attributes : {};
+    const where = data.where ? data.where : {};
+    return await HousePriceCity.findAll({
+      attributes: attributes,
+      where : where,
+    });
+  }
+
+  HousePriceCity.list = async (data = {}) => {
+    const limit = data.limit ? data.limit : 10;
+    const page = data.page ? data.page : 1;
+    const order = data.order ? data.order : [];
+    const attributes = data.attributes ? data.attributes : {};
+    const where = data.where ? data.where : {};
+    const condition = {
+      offset: (page - 1) * limit,
+      limit,
+      where: where,
+      order: order,
+      attributes: attributes,
+    };
+
+    const { count, rows } =  await HousePriceCity.findAndCountAll(condition);
+    return { page, count, rows };
+  }
+
+  HousePriceCity.add = async (data) => {
+    try {
+      //返回promise对象实力 instance 
+      const res = await HousePriceCity.create(data);
+      //从promise 实例中中获得需要的id号，id 必须是自增长，而且必须主键，否则返回null
+      return res.id;  
+    } catch(error) {
+      ctx.status = 500;
+      throw (error);
+    }    
+  }
+
+  HousePriceCity.edit = async (data) => {
+    const where = data.where;
+    const params = data.params;
+    HousePriceCity.update(params, {
+      where: where
+    }).catch( e => res.json({status: 500, error: e}));
+  }
+
+  return HousePriceCity;
+
+};

app/model/block/house_supply_demand.js

+'use strict';
+module.exports = app => {
+    const { INTEGER, TEXT } = app.Sequelize;
+
+    const HouseSupplyDemand = app.blockModel.define('house_supply_demand', {
+        id: {
+            type: INTEGER,
+            allowNull: false,
+            primaryKey: true,
+            autoIncrement: true,
+        },
+        supply_demand_json: {
+            type: TEXT,
+            allowNull: true,
+            field: 'supply_demand_json',
+            get() {
+                const supply_demand_json = this.getDataValue('supply_demand_json');
+                if (supply_demand_json) {
+                    try {
+                        return JSON.parse(supply_demand_json);
+                    } catch (error) {
+                        return [];
+                    }
+                }
+                return [];
+            },
+        },
+    }, {
+            timestamps: false,
+            tableName: 'house_supply_demand',
+            freezeTableName: true,
+        });
+
+    HouseSupplyDemand.one = async (data) => {
+        const attributes = data.attributes ? data.attributes : {};
+        const where = data.where ? data.where : {};
+        return await HouseSupplyDemand.findOne({
+            attributes: attributes,
+            where: where,
+        });
+    }
+
+
+    HouseSupplyDemand.all = async (data) => {
+        const attributes = data.attributes ? data.attributes : {};
+        const where = data.where ? data.where : {};
+        return await HouseSupplyDemand.findAll({
+            attributes: attributes,
+            where: where,
+        });
+    }
+
+    HouseSupplyDemand.list = async (data = {}) => {
+        const limit = data.limit ? data.limit : 10;
+        const page = data.page ? data.page : 1;
+        const order = data.order ? data.order : [];
+        const attributes = data.attributes ? data.attributes : {};
+        const where = data.where ? data.where : {};
+        const condition = {
+            offset: (page - 1) * limit,
+            limit,
+            where: where,
+            order: order,
+            attributes: attributes,
+        };
+
+        const { count, rows } = await HouseSupplyDemand.findAndCountAll(condition);
+        return { page, count, rows };
+    }
+
+    HouseSupplyDemand.add = async (data) => {
+        try {
+            //返回promise对象实力 instance 
+            const res = await HouseSupplyDemand.create(data);
+            //从promise 实例中中获得需要的id号，id 必须是自增长，而且必须主键，否则返回null
+            return res.id;
+        } catch (error) {
+            ctx.status = 500;
+            throw (error);
+        }
+    }
+
+    HouseSupplyDemand.edit = async (data) => {
+        const where = data.where;
+        const params = data.params;
+        HouseSupplyDemand.update(params, {
+            where: where
+        }).catch(e => res.json({ status: 500, error: e }));
+    }
+
+    return HouseSupplyDemand;
+
+};

app/router/house.js

@@ -48,13 +48,16 @@ module.exports = app => {
 
 
     //房产v2
-    router.get('/v2/tool/:house_style/:area_code/:level', 'house.tool.getMapPoint');//购房计划地图点位
+    router.get('/v2/tool/:house_style/:area_code/:level', 'house.v2.tool.getMapPoint');//购房计划地图点位(存钱罐地图)（房价地图）
     router.post('/v2/tool/plan', 'house.tool.generateBuyHousePlan');//生成购房计划
-    router.get('/v2/tool/:type/:area_code', 'house.tool.getHousePriceFeature');//房价指数 房价涨跌 购房资格、贷款额度问答
+    router.get('/v2/tool/:type/:area_code', 'house.v2.tool.getHousePriceFeature');//房价走势图 房价涨跌图 购房资格图、贷款额度问答、供需趋势图
     router.post('/v2/tool/calculate_price', 'house.tool.calculateHousePrice');//房产估价
     router.get('/v2/tool/qfang_area_list', 'house.tool.getQFangAreaList');//房产估价模糊匹配到的小区列表
     router.get('/v2/tool/map_houses', 'house.tool.getMapHouses');//房产估价模糊匹配到的小区列表
 
+    router.get('/v2/tool/house_price_feature_city', 'house.v2.tool.getHousePriceFeatureCity');//房产估价模糊匹配到的小区列表
+    router.get('/v2/tool/house_price_city', 'house.v2.tool.getHousePriceCity');//房产估价模糊匹配到的小区列表
+
 
     //租房列表
     router.get('/v2/rental_house/home', 'house.v2.rentalHouse.home');//租房首页信息