Merge branch 'master' of gitee.com:renjianbo0118/order

common/models/member/DeviceInfo.py

@@ -0,0 +1,26 @@
+# coding: utf-8
+from sqlalchemy import Column, DateTime, Integer, String
+from sqlalchemy.schema import FetchedValue
+from flask_sqlalchemy import SQLAlchemy
+
+
+db = SQLAlchemy()
+
+
+class Deviceinfo(db.Model):
+    __tablename__ = 'deviceinfo'
+
+    id = db.Column(db.Integer, primary_key=True)
+    nickname = db.Column(db.String(100), nullable=False, server_default=db.FetchedValue())
+    jiguang = db.Column(db.String(100), nullable=False, server_default=db.FetchedValue())
+    version = db.Column(db.String(100), nullable=False, server_default=db.FetchedValue())
+    xiaoqu = db.Column(db.String(100), nullable=False, server_default=db.FetchedValue())
+    louhao = db.Column(db.String(100), nullable=False, server_default=db.FetchedValue())
+    danyuan = db.Column(db.String(100), nullable=False, server_default=db.FetchedValue())
+    jingdu = db.Column(db.String(100), nullable=False, server_default=db.FetchedValue())
+    weidu = db.Column(db.String(100), nullable=False, server_default=db.FetchedValue())
+    snnum = db.Column(db.String(100), nullable=False, server_default=db.FetchedValue())
+    mobile = db.Column(db.String(11), nullable=False, server_default=db.FetchedValue())
+    reg_ip = db.Column(db.String(100), nullable=False, server_default=db.FetchedValue())
+    updated_time = db.Column(db.DateTime, nullable=False, server_default=db.FetchedValue())
+    created_time = db.Column(db.DateTime, nullable=False, server_default=db.FetchedValue())

web/controllers/api/Member.py

@@ -5,6 +5,7 @@ from application import  app,db
 import requests,json
 from common.models.member.Member import Member
 from common.models.member.Mendianuserinfo import Mendianuserinfo
+from common.models.member.DeviceInfo import Deviceinfo
 from common.models.member.Memberinfoo import Memberinfoo
 from common.models.member.Membermiya import Membermiya
 from common.models.member.OauthMemberBind import OauthMemberBind
@@ -82,6 +83,48 @@ def logintwo():
         db.session.commit()
     return jsonify(resp)
 
+@route_api.route("/member/deviceinfo",methods = [ "GET","POST" ])
+def deviceinfo():
+    resp = {'code': 200, 'msg': '操作成功~', 'data': {}}
+    req = request.values
+    app.logger.info(req)
+    name = req['name'] if 'name' in req else ''
+    app.logger.info(name)
+    version = req['version'] if 'version' in req else ''
+    app.logger.info(version)
+    jiguang = req['jiguang'] if 'jiguang' in req else ''
+    app.logger.info(jiguang)
+    xiaoqu = req['xiaoqu'] if 'xiaoqu' in req else ''
+    app.logger.info(xiaoqu)
+    louhao = req['louhao'] if 'louhao' in req else ''
+    app.logger.info(louhao)
+    danyuan = req['danyuan'] if 'danyuan' in req else ''
+    app.logger.info(danyuan)
+    jingdu = req['jingdu'] if 'jingdu' in req else ''
+    app.logger.info(jingdu)
+    weidu = req['weidu'] if 'weidu' in req else ''
+    app.logger.info(weidu)
+    snnum = req['snnum'] if 'snnum' in req else ''
+    app.logger.info(snnum)
+
+    name_info = Deviceinfo.query.filter_by(nickname=name).first()
+    if not name_info:
+        model_deviceinfo = Deviceinfo()
+        model_deviceinfo.nickname = name
+        model_deviceinfo.version = version
+        model_deviceinfo.jiguang = jiguang
+        model_deviceinfo.xiaoqu = xiaoqu
+        model_deviceinfo.louhao = louhao
+        model_deviceinfo.danyuan = danyuan
+        model_deviceinfo.jingdu = jingdu
+        model_deviceinfo.weidu = weidu
+        model_deviceinfo.snnum = snnum
+        db.session.add(model_deviceinfo)
+        db.session.commit()
+    return jsonify(resp)
+
+
+
 @route_api.route("/member/loginmiya",methods = [ "GET","POST" ])
 def loginmiya():
     resp = {'code': 200, 'msg': 'r操作成功~', 'data': {}}

数据库文件/food.sql

@@ -73,6 +73,28 @@ create TABLE `member` (
 
 
 
+drop table IF EXISTS `deviceinfo`;
+
+create TABLE `deviceinfo` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `nickname` varchar(100) NOT NULL DEFAULT '' COMMENT '会员名',
+  `jiguang` varchar(100) NOT NULL DEFAULT '' COMMENT '极光id',
+  `version` varchar(100) NOT NULL DEFAULT '' COMMENT '版本号',
+  `xiaoqu` varchar(100) NOT NULL DEFAULT '' COMMENT '小区',
+  `louhao` varchar(100) NOT NULL DEFAULT '' COMMENT '楼号',
+  `danyuan` varchar(100) NOT NULL DEFAULT '' COMMENT '单元号',
+  `jingdu` varchar(100) NOT NULL DEFAULT '' COMMENT '经度',
+  `weidu` varchar(100) NOT NULL DEFAULT '' COMMENT '纬度',
+  `snnum` varchar(100) NOT NULL DEFAULT '' COMMENT 'sn号',
+  `mobile` varchar(11) NOT NULL DEFAULT '' COMMENT '会员手机号码',
+  `reg_ip` varchar(100) NOT NULL DEFAULT '' COMMENT '注册ip',
+  `updated_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '最后一次更新时间',
+  `created_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '插入时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='设备注册表';
+
+
+
 drop table IF EXISTS `oauth_member_bind`;
 
 create TABLE `oauth_member_bind` (