添加daily,diner,activity,store

测试
1 parent e4ff71cd
Showing 7 changed files with 46 additions and 92 deletions Show diff stats
src/models/Activity.lua
src/models/Daily.lua
src/models/Diner.lua
src/models/RolePlugin.lua
src/models/Store.lua
src/services/dbseed.lua
src/shared/ModelBaseMysql.lua
-local Activity = class("Activity", require("shared.ModelBase"))
+local Activity = class("Activity", require("shared.ModelBaseMysql"))
 local string_format = string.format
 -- activity_ctr showType
@@ -64,6 +64,7 @@ end
 Activity.schema = {
+	id 			= {"number", 0, "pri"},		-- 角色id
 	actime 		= {"table", {}},  -- 最近检查某项活动的开始时间  {id = time}
 	round		= {"table", {}},  -- 记录活动到了第几轮  {id = roundnum}
 	act4		= {"table", {}},  -- {0 = day, 1= -1, 2 = -1} == 签到活动
 -- 日常数据
-local Daily = class("Daily", require("shared.ModelBase"))
+local Daily = class("Daily", require("shared.ModelBaseMysql"))
 function Daily:ctor(properties)
 	Daily.super.ctor(self, properties)
 end
 Daily.schema = {
-	commentHero		= {"string", ""},		-- 单日评论食灵记录 type=1
+	id 				= {"number", 0, "pri"},		-- 角色id
+	commentHero		= {"string", "", "blob"},		-- 单日评论食灵记录 type=1
 	hangQC			= {"number", 0},		-- 挂机快速次数
 	dinerQC			= {"number", 0},		-- 贩卖加速次数
 	advElC			= {"number", 0},		-- 无尽次数（消耗体力）
-local Diner = class("Diner", require("shared.ModelBase"))
+local Diner = class("Diner", require("shared.ModelBaseMysql"))
 function Diner:ctor(properties)
 	Diner.super.ctor(self, properties)
 end
 Diner.schema = {
+	id 		= {"number", 0, "pri"},		-- 角色id
 	buildL 	= {"string", ""},			-- 家具等级 1=1 2=1 3=1
-	order 	= {"string", "[]"},			-- 特殊订单
-	sells 	= {"string", "[]"},			-- 贩卖位置
+	order 	= {"string", "[]", 1024},			-- 特殊订单
+	sells 	= {"string", "[]", "", 1024},			-- 贩卖位置
 	dishTree	= {"string", "1=1 101=1 201=1"},		-- 料理天赋
 	skillTree	= {"string", ""},		-- 支援天赋
 	popular = {"number",0},          	-- 累计人气
@@ -628,10 +628,10 @@ function RolePlugin.bind(Role)
 	function Role:loadDaily()
 		local roleId = self:getProperty("id")
-		local dataKey = string.format(R_DAILY, roleId)
-		self.dailyData = require("models.Daily").new({key = dataKey})
+		local dataKey = string.format("%d", roleId)
+		self.dailyData = require("models.Daily").new({key = dataKey, id = roleId})
 		self.dailyData.owner = self
-		if not redisproxy:exists(dataKey) then
+		if not self.dailyData:checkKeyExists(dataKey) then
 			self.dailyData:create()
 		else
 			self.dailyData:load()
@@ -640,10 +640,10 @@ function RolePlugin.bind(Role)
 	function Role:loadActivity()
 		local roleId = self:getProperty("id")
-		local dataKey = string.format(R_ACTIVITY, roleId)
-		self.activity = require("models.Activity").new({key = dataKey})
+		local dataKey = string.format("%d", roleId)
+		self.activity = require("models.Activity").new({key = dataKey, id = roleId})
 		self.activity.owner = self
-		if not redisproxy:exists(dataKey) then
+		if not self.activity:checkKeyExists(dataKey) then
 			self.activity:create()
 		else
 			self.activity:load()
@@ -652,10 +652,10 @@ function RolePlugin.bind(Role)
 	function Role:loadDiner()
 		local roleId = self:getProperty("id")
-		local dataKey = string.format(R_DINER, roleId)
-		self.dinerData = require("models.Diner").new({key = dataKey})
+		local dataKey = string.format("%d", roleId)
+		self.dinerData = require("models.Diner").new({key = dataKey, id = roleId})
 		self.dinerData.owner = self
-		if not redisproxy:exists(dataKey) then
+		if not self.dinerData:checkKeyExists(dataKey) then
 			self.dinerData:create()
 		else
 			self.dinerData:load()
@@ -669,10 +669,10 @@ function RolePlugin.bind(Role)
 	function Role:loadStoreInfo()
 		local roleId = self:getProperty("id")
-		local dataKey = string.format(R_STORE, roleId)
-		self.storeData = require("models.Store").new({key = dataKey})
+		local dataKey = string.format("%d", roleId)
+		self.storeData = require("models.Store").new({key = dataKey, id = roleId})
 		self.storeData.owner = self
-		if not redisproxy:exists(dataKey) then
+		if not self.storeData:checkKeyExists(dataKey) then
 			self.storeData:create()
 		else
 			self.storeData:load()
 -- 商店数据
-local Store = class("Store", require("shared.ModelBase"))
+local Store = class("Store", require("shared.ModelBaseMysql"))
 function Store:ctor(properties)
 	Store.super.ctor(self, properties)
@@ -11,6 +11,7 @@ ActGoodsType = {
 }
 Store.schema = {
+	id 		= {"number", 0, "pri"},		-- 角色id
 	buyR		= {"table", {}},		-- 购买商品记录 {id=count}
 	payR	= {"table", {}},		-- 充值记录 {id=count}
 	growFund		= {"number", 0},		-- 成长基金
@@ -89,8 +89,13 @@ local function initAdvSeasonTable()
 end
 local function checkRoleTables()
-		local role = require("models.Role").new({key = "key"})
-		role:checkTableSchema()
+	local list = {"Role", "Daily", "Activity", "Diner", "Store"}
+	for _, name in ipairs(list) do
+		local obj = require("models."..name).new({key = "key"})
+		print("check table [" .. name .. "] begin.")
+		obj:checkTableSchema()
+		print("check table [" .. name .. "] end.")
+	end
 end
 local steps = {
@@ -117,7 +122,6 @@ local steps = {
 }
 skynet.start(function ()
-	redisproxy = require("shared.redisproxy")
 	--local new = redisproxy:hsetnx("autoincrement_set", "server_start", os.date("%Y%m%d", skynet.timex())) == 1
 	--if not new then
 	--	print("server has been initialized...")
@@ -35,51 +35,6 @@ function ModelBaseMysql:ctor(properties)
     self:getPriKey()
 end
--- startCache 和 endCache 在恰当的时候*配对使用*  嵌套使用多次增加引用计数 直到引用计数为0 写入
-function ModelBaseMysql:startCache( ... )
-    for _, field in ipairs({ ... }) do
-        if self.class.schema[field] then
-            self.cacheFields[field] = (self.cacheFields[field] or 0) + 1
-        end
-    end
-end
-
---减少缓存引用计数 为时写入, 无参数 强制刷新所有缓存
-function ModelBaseMysql:endCache( ... )
-    local args = { ... }
-    local params = {}
-
-    local function doOneCache(field)
-        local propname = field .. "_"
-        table_insert(params, field)
-        if self.class.schema[field][1] == "table" then
-            table_insert(params, MsgPack.pack(self[propname]))
-        else
-            table_insert(params, self[propname])
-        end
-    end
-
-    if not next(args) then
-        for field, _ in pairs(self.cacheFields) do
-            doOneCache(field)
-        end
-        self.cacheFields = {}
-    else
-        for _, field in ipairs(args) do
-            if self.cacheFields[field] then
-                self.cacheFields[field] = self.cacheFields[field] - 1
-                if self.cacheFields[field] <= 0 then
-                    self.cacheFields[field] = nil
-                    doOneCache(field)
-                end
-            end
-        end
-    end
-
-    if next(params) then
-        redisproxy:hmset(self:getKey(), table_unpack(params))
-    end
-end
 --[[--
 返回对象的 ID 值。
@@ -100,6 +55,7 @@ function ModelBaseMysql:getPriKey()
         local objType, def, keyType, length = table_unpack(v)
         if keyType == "pri" then
             self.pri_key = k
+            break
         end
     end
 end
@@ -172,9 +128,9 @@ function ModelBaseMysql:save()
                update_list = update_list .. ","
             end
-            key_list = key_list .. k
+            key_list = key_list .. "`" .. k .. "`"
             value_list = value_list .. v
-            update_list = update_list .. k .. "=" .. v
+            update_list = update_list .. "`" .. k .. "`=" .. v
         end
         sql = string_format(sql, tbName, key_list, value_list, update_list)
         mysqlproxy:query(sql)
@@ -284,14 +240,7 @@ function ModelBaseMysql:setProperty(property, value)
          tostring(self), self.class.__cname, property, typ, type(value)))
     self[propname] = value
-    if not self.cacheFields[property] then
-        -- table 使用msgpack
-        if typ == "table" then
-            value = MsgPack.pack(value)
-        end
-        --redisproxy:hset(self:getKey(), property, value)
-        self:save()
-    end
+    self:save()
 end
 function ModelBaseMysql:setProperties(fields)
@@ -312,20 +261,15 @@ function ModelBaseMysql:setProperties(fields)
                  tostring(self), self.class.__cname, property, typ, type(value)))
             self[propname] = value
-            if not self.cacheFields[property] then
-                table_insert(result, property)
-                if typ == "table" then
-                    table_insert(result, MsgPack.pack(self[propname]))
-                else
-                    table_insert(result, self[propname])
-                end
+            table_insert(result, property)
+            if typ == "table" then
+                table_insert(result, MsgPack.pack(self[propname]))
+            else
+                table_insert(result, self[propname])
             end
         end
     end
-    if next(result) then
-        --redisproxy:hmset(self:getKey(), table_unpack(result))
-        self:save()
-    end
+    self:save()
 end
 function ModelBaseMysql:incrProperty(property, value)
@@ -346,10 +290,7 @@ function ModelBaseMysql:incrProperty(property, value)
          tostring(self), self.class.__cname, property, typ, type(value)))
     self[propname] = self[propname] + value
-    if not self.cacheFields[property] then
-        --return redisproxy:hincrby(self:getKey(), property, value)
-        self:save()
-    end
+    self:save()
 end
 function ModelBaseMysql:onLoad()
@@ -358,6 +299,11 @@ end
 function ModelBaseMysql:onCreate()
 end
+function ModelBaseMysql:checkKeyExists(key)
+    local res = mysqlproxy:query(string_format("SELECT * FROM `%s` WHERE `%s` = %s", self.class.__cname, self.pri_key, key))
+    return next(res)
+end
+
 function ModelBaseMysql:checkTableSchema()
     -- 1.检测是否表存在
     local typeMap = {