From fe1bc4bc6059ed12e0588d1feb326af7bf8ec952 Mon Sep 17 00:00:00 2001 From: shy Date: Fri, 2 Aug 2024 18:41:34 +0800 Subject: [PATCH] add some --- src/gonganxitong/apply.go | 58 +++++++++++++----------- src/gonganxitong/apply.js | 7 ++- src/gonganxitong/city.go | 24 ++++++++++ src/gonganxitong/common.go | 13 +++--- src/gonganxitong/email.go | 35 +++++++------- src/gonganxitong/event.go | 25 +++++++--- src/gonganxitong/event.js | 3 +- src/gonganxitong/express/common.go | 8 ++++ src/gonganxitong/express/common.json | 7 +++ src/gonganxitong/express/express.go | 18 ++++++++ src/gonganxitong/express/model/model.go | 12 +++++ src/gonganxitong/icons/apply.png | Bin 0 -> 4840 bytes src/gonganxitong/icons/event.png | Bin 0 -> 4684 bytes src/gonganxitong/icons/house.png | Bin 0 -> 6121 bytes src/gonganxitong/icons/office.png | Bin 0 -> 4370 bytes src/gonganxitong/icons/order.png | Bin 0 -> 4212 bytes src/gonganxitong/model/model.go | 46 ++++++++++--------- src/gonganxitong/model/model.sql | 1 - src/gonganxitong/order.go | 55 ++++++++++++---------- src/gonganxitong/order.js | 15 +++--- src/gonganxitong/place.go | 40 +++++++++++++++- src/gonganxitong/placeUser.go | 22 +++++++++ src/gonganxitong/placeUser.js | 13 ++++++ src/gonganxitong/portal.css | 9 +++- src/gonganxitong/portal.go | 25 +++++----- src/gonganxitong/portal.js | 27 +++++++---- src/gonganxitong/portal.json | 51 ++++++++++++++------- src/gonganxitong/portal.shy | 11 +++++ src/gonganxitong/qrcode.go | 12 +++-- src/gonganxitong/sess.go | 3 +- src/gonganxitong/street.go | 17 ++++++- src/gonganxitong/user.go | 10 ++-- src/gonganxitong/userPlace.go | 23 ++++++---- src/main.go | 1 + src/template/web.code.autogen/demo.go | 2 +- 35 files changed, 417 insertions(+), 176 deletions(-) create mode 100644 src/gonganxitong/city.go create mode 100644 src/gonganxitong/express/common.go create mode 100644 src/gonganxitong/express/common.json create mode 100644 src/gonganxitong/express/express.go create mode 100644 src/gonganxitong/express/model/model.go create mode 100644 src/gonganxitong/icons/apply.png create mode 100644 src/gonganxitong/icons/event.png create mode 100644 src/gonganxitong/icons/house.png create mode 100644 src/gonganxitong/icons/office.png create mode 100644 src/gonganxitong/icons/order.png delete mode 100644 src/gonganxitong/model/model.sql create mode 100644 src/gonganxitong/placeUser.go create mode 100644 src/gonganxitong/placeUser.js create mode 100644 src/gonganxitong/portal.shy diff --git a/src/gonganxitong/apply.go b/src/gonganxitong/apply.go index 2022b99..f8e685a 100644 --- a/src/gonganxitong/apply.go +++ b/src/gonganxitong/apply.go @@ -11,21 +11,18 @@ type apply struct { Table user user userPlace userPlace - place place street street + city city + place place event event portal string `data:"true"` - create string `name:"create place_uid*:select user_place_role*:select begin_time:select@date end_time:select@date" role:"void"` + create string `name:"create place_uid* user_place_role*:select begin_time:select@date end_time:select@date" role:"void"` cancel string `name:"cancel" role:"void"` submit string `name:"submit" role:"void"` - list string `name:"list place_uid uid auto" role:"void"` } func (s apply) Inputs(m *ice.Message, arg ...string) { switch arg[0] { - case model.PLACE_UID: - m.Cmdy(s.userPlace, m.Option(model.USER_UID)) - m.Cut(model.PLACE_UID, model.PLACE_NAME).DisplayInputKeyNameIconTitle() case model.USER_PLACE_ROLE: for k, v := range UserPlaceRoleList { if k != UserPlaceCreator && k != UserPlaceVisitor { @@ -47,33 +44,49 @@ func (s apply) Cancel(m *ice.Message, arg ...string) { s.SendTemplate(m, msg.Append(model.USER_UID), "场所权限申请 已取消") } func (s apply) Submit(m *ice.Message, arg ...string) { + msg := s.status(m, ApplyCreate, ApplySubmit) + if m.WarnNotValid(msg.IsErr()) { + return + } defer s.event.Record(m, m.Option(model.UID)) defer m.ToastProcess()() role := UserPlaceCreator - switch UserPlaceRole(kit.Int(s.status(m, ApplyCreate, ApplySubmit).Append(model.ROLE))) { + switch UserPlaceRole(kit.Int(msg.Append(model.ROLE))) { case UserPlaceLandlord: role = UserPlaceCreator case UserPlaceTenant, UserPlaceAdmin: role = UserPlaceLandlord } - msg := m.Cmd(s.userPlace, s.userPlace.Select, m.OptionSimple(model.PLACE_UID), model.ROLE, role.String()) + msg = m.Cmd(s.userPlace, s.userPlace.Select, m.OptionSimple(model.PLACE_UID), model.ROLE, role.String()) + if m.WarnNotFound(msg.Length() == 0, role.String()) { + return + } m.Cmd(order{}, order{}.Create, msg.AppendSimple(model.USER_UID), model.APPLY_UID, m.Option(model.UID), model.STATUS, OrderCreate) - s.SendTemplate(m, m.Option(model.USER_UID), "场所权限申请 已提交 🕑") + s.SendTemplate(m, m.Option(model.USER_UID), "场所权限申请 已提交") +} +func (s apply) Reject(m *ice.Message, arg ...string) { + msg := s.status(m, ApplySubmit, ApplyRejected) + s.SendTemplate(m, msg.Append(model.USER_UID), "场所权限申请 已驳回 ❌") +} +func (s apply) Approve(m *ice.Message, arg ...string) { + msg := s.status(m, ApplySubmit, ApplyApproved) + s.SendTemplate(m, msg.Append(model.USER_UID), "场所权限申请 已通过 ✅") + m.Cmd(s.userPlace, s.userPlace.Create, msg.AppendSimple(model.USER_UID, model.PLACE_UID, model.ROLE)) } func (s apply) List(m *ice.Message, arg ...string) { - s.Tables(m, s.place, s.street).Fields(m, "applies.created_at", - model.PLACE_NAME, model.PLACE_TYPE, "applies.role AS user_place_role", model.APPLY_STATUS, - model.STREET_NAME, model.PLACE_ADDRESS, "applies.uid", model.PLACE_UID, model.STREET_UID, + s.Tables(m, s.user, s.place, s.street, s.city).Fields(m, s.Key(s, model.CREATED_AT), s.Key(s, model.ID), + model.USER_NAME, model.USER_AVATAR, + model.PLACE_NAME, model.PLACE_TYPE, s.AS(s.Key(s, model.ROLE), model.USER_PLACE_ROLE), model.APPLY_STATUS, + model.CITY_NAME, model.STREET_NAME, model.PLACE_ADDRESS, model.BEGIN_TIME, model.END_TIME, - ).Orders(m, "created_at DESC") + s.Key(s, model.UID), model.PLACE_UID, + ).Orders(m, s.Desc(model.CREATED_AT)) if len(arg) == 0 { if m.IsTech() { s.Table.Select(m) - } else { - s.Table.Select(m, m.OptionSimple(model.USER_UID)...) } } else if len(arg) == 1 { - if s.Table.Select(m, model.USER_UID, m.Option(model.USER_UID), model.PLACE_UID, arg[0]).Action(s.Create); m.Length() == 0 { + if s.Table.Select(m, model.USER_UID, m.Option(model.USER_UID), model.PLACE_UID, arg[0]); m.Length() == 0 { m.EchoInfoButton(m.Trans("please create apply", "请创建权限申请"), s.Create) return } @@ -85,7 +98,7 @@ func (s apply) List(m *ice.Message, arg ...string) { ApplyCancel.String(), }, ice.STR_R) } else { - s.Table.Select(m.FieldsSetDetail(), "applies.uid", arg[1]) + s.Table.Select(m.FieldsSetDetail(), s.Key(s, model.UID), arg[1]) if ApplyStatus(kit.Int(m.Append(model.APPLY_STATUS))) == ApplySubmit { m.EchoQRCode(cmdurl(m, arg[0], m.Prefix("order"), arg[1])) } @@ -101,17 +114,8 @@ func (s apply) List(m *ice.Message, arg ...string) { s.RewriteAppend(m).Display("").DisplayCSS("") } -func init() { ice.Cmd(prefixKey(), apply{}) } +func init() { ice.TeamCtxCmd(apply{}) } -func (s apply) Reject(m *ice.Message, arg ...string) { - msg := s.status(m, ApplySubmit, ApplyRejected) - s.SendTemplate(m, msg.Append(model.USER_UID), "场所权限申请 已驳回 ❌") -} -func (s apply) Approve(m *ice.Message, arg ...string) { - msg := s.status(m, ApplySubmit, ApplyApproved) - s.SendTemplate(m, msg.Append(model.USER_UID), "场所权限申请 已通过 ✅") - m.Cmd(s.userPlace, s.userPlace.Create, msg.AppendSimple(model.USER_UID, model.PLACE_UID, model.ROLE)) -} func (s apply) status(m *ice.Message, from, todo ApplyStatus, arg ...string) *ice.Message { msg := s.Table.Select(m.Spawn(), m.OptionSimple(model.UID)...) if !m.WarnNotFound(msg.Length() == 0, m.Option(model.UID)) { diff --git a/src/gonganxitong/apply.js b/src/gonganxitong/apply.js index 07be3ee..3f640a1 100644 --- a/src/gonganxitong/apply.js +++ b/src/gonganxitong/apply.js @@ -1,17 +1,16 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { if (msg.IsDetail()) { return msg.Dump(can) } - can.page.Append(can, can._output, msg.Table(function(value) { - value._style = [value.place_type, value.user_place_role, value.apply_status] + can.page.Append(can, can._output, msg.Table(function(value) { value._style = [value.place_type, value.user_place_role, value.apply_status] return can.onimport.itemcard(can, value, [ {view: html.TITLE, list: [{text: value.place_name}, {text: [can.user.transValue(can, value, "place_type"), "", mdb.TYPE]}, {text: [can.user.transValue(can, value, "user_place_role"), "", aaa.ROLE]}, {text: [can.user.transValue(can, value, "apply_status"), "", mdb.STATUS]}, ]}, - {view: html.STATUS, list: [{text: value.street_name}, {text: value.place_address}]}, {view: html.STATUS, list: [{text: value.uid.slice(0, 6)}, {text: can.base.TimeTrim(value.created_at)}]}, {view: html.STATUS, list: [{text: value.begin_time.split(" ")[0]}, {text: value.end_time.split(" ")[0]}]}, - ], function() { can.Option("uid", value.uid), can.Update() }) + {view: html.STATUS, list: [{text: value.city_name}, {text: value.street_name}, {text: value.place_address}]}, + ]) })) }, }) \ No newline at end of file diff --git a/src/gonganxitong/city.go b/src/gonganxitong/city.go new file mode 100644 index 0000000..684f566 --- /dev/null +++ b/src/gonganxitong/city.go @@ -0,0 +1,24 @@ +package gonganxitong + +import ( + "shylinux.com/x/ice" + + "shylinux.com/x/community/src/gonganxitong/model" +) + +type city struct{ Table } + +func init() { ice.TeamCtxCmd(city{}) } + +func (s city) FindOrCreateByName(m *ice.Message, arg ...string) { + if msg := m.Cmd(s, s.Select, model.NAME, arg[1]); msg.Length() == 0 { + msg := m.Cmd(s, s.Create, model.NAME, arg[1]) + arg[0], arg[1] = model.CITY_UID, msg.Result() + } else { + arg[0], arg[1] = model.CITY_UID, msg.Append(model.UID) + } +} + +type City struct{ city } + +func init() { ice.TeamCtxCmd(City{}) } diff --git a/src/gonganxitong/common.go b/src/gonganxitong/common.go index 7615d76..86fda2f 100644 --- a/src/gonganxitong/common.go +++ b/src/gonganxitong/common.go @@ -11,15 +11,16 @@ import ( type Table struct { db.Table - list string `name:"list place_uid uid auto"` + inputs string `name:"inputs" role:"void"` + list string `name:"list place_uid uid auto" role:"void"` } -func (s Table) Inputs(m *ice.Message, arg ...string) { - s.Table.Inputs(m, arg...) -} func (s Table) Init(m *ice.Message, arg ...string) { kit.If(m.Config(web.PORTAL) == ice.TRUE, func() { portal{}.Show(m) }) } +func (s Table) Inputs(m *ice.Message, arg ...string) { + s.Table.Inputs(m, arg...) +} func (s Table) List(m *ice.Message, arg ...string) *ice.Message { if len(arg) == 0 || len(arg) == 1 { if m.IsTech() { @@ -47,8 +48,6 @@ func (s Table) SendTemplate(m *ice.Message, user_uid, title string) { } } func cmdurl(m *ice.Message, arg ...string) string { - return m.MergePodCmd("", m.Prefix(web.PORTAL), ice.MSG_DEBUG, m.Option(ice.MSG_DEBUG)) + + return m.MergePodCmd("", m.Prefix(web.PORTAL)) + "?debug=true" + "#" + kit.Join([]string{arg[0], kit.Select(m.PrefixKey(), arg, 1), kit.Select("", arg, 2)}, ":") } - -func prefixKey() string { return kit.Keys("web.team", kit.PathName(-1), kit.FileName(-1)) } diff --git a/src/gonganxitong/email.go b/src/gonganxitong/email.go index d92b84d..1c62f97 100644 --- a/src/gonganxitong/email.go +++ b/src/gonganxitong/email.go @@ -14,37 +14,40 @@ import ( type email struct { user user portal portal - Creds emails.Creds - apply string `name:"apply username* password*"` - reset string `name:"reset password*" help:"重置密码"` + creds emails.Creds + apply string `name:"apply username* password*" role:"void"` + reset string `name:"reset password*" help:"重置密码" role:"void"` } func (s email) Init(m *ice.Message, arg ...string) { s.portal.Show(m) } -func (s email) List(m *ice.Message, arg ...string) { - if msg := m.Cmd(s.user, s.user.Select, model.UID, m.Option(model.USER_UID)); len(msg.Append(model.EMAIL)) < 10 { - m.EchoInfoButton(m.Trans("please apply email", "请申请邮箱"), s.Apply) - } else { - m.EchoInfoButton(msg.Append(model.EMAIL), s.Reset) - } -} func (s email) Apply(m *ice.Message, arg ...string) { + defer m.ToastProcess()() msg := m.Cmd(s.user, s.user.Select, model.UID, m.Option(model.USER_UID)) if m.Warn(msg.Append(model.EMAIL) != "", m.Trans("email already exists", "邮箱已存在")) { return } if !strings.Contains(m.Option(aaa.USERNAME), "@") { - m.Option(aaa.USERNAME, m.Option(aaa.USERNAME)+"@"+m.UserWeb().Hostname()) + m.Option(aaa.USERNAME, m.Option(aaa.USERNAME)+"@"+strings.Split(m.UserHost(), "://")[1]) } - m.Cmdy(s.Creds, s.Creds.Create, m.Option(aaa.USERNAME), m.Option(aaa.PASSWORD)) + m.Cmdy(s.creds, s.creds.Create, m.Option(aaa.USERNAME), m.Option(aaa.PASSWORD)) kit.If(!m.IsErr(), func() { m.Cmdy(s.user, s.user.Email, m.Option(aaa.USERNAME)) }) - kit.If(!m.IsErr(), func() { m.ToastSuccess() }) } func (s email) Reset(m *ice.Message, arg ...string) { + defer m.ToastProcess()() msg := m.Cmd(s.user, s.user.Select, model.UID, m.Option(model.USER_UID)) - m.Cmdy(s.Creds, s.Creds.Password, msg.Append(model.EMAIL), m.Option(aaa.PASSWORD)) - kit.If(!m.IsErr(), func() { m.ToastSuccess() }) + if m.WarnNotFound(msg.Append(model.EMAIL) == "", model.EMAIL) { + return + } + m.Cmdy(s.creds, s.creds.Password, msg.Append(model.EMAIL), m.Option(aaa.PASSWORD)) +} +func (s email) List(m *ice.Message, arg ...string) { + if msg := m.Cmd(s.user, s.user.Select, model.UID, m.Option(model.USER_UID)); msg.Append(model.EMAIL) == "" { + m.EchoInfoButton(m.Trans("please apply email", "请申请邮箱"), s.Apply) + } else { + m.EchoInfoButton(msg.Append(model.EMAIL), s.Reset) + } } -func init() { ice.Cmd(prefixKey(), email{}) } +func init() { ice.TeamCtxCmd(email{}) } diff --git a/src/gonganxitong/event.go b/src/gonganxitong/event.go index d6f7544..e957fa6 100644 --- a/src/gonganxitong/event.go +++ b/src/gonganxitong/event.go @@ -16,13 +16,24 @@ type event struct { func (s event) List(m *ice.Message, arg ...string) { s.Tables(m, s.user).Fields(m, - "events.created_at", "events.uid", - "index", "operate", "args", - "users.avatar AS icons", "user_name", "user_uid", - ).Orders(m, "created_at DESC").Select(m).Display("") + s.Key(s, model.CREATED_AT), s.Key(s, model.ID), + model.USER_AVATAR, model.USER_NAME, + ctx.INDEX, model.OPERATE, ctx.ARGS, model.INFO, + s.Key(s, model.UID), model.USER_UID, + ).Orders(m, s.Desc(model.CREATED_AT)) + if len(arg) == 0 { + if m.IsTech() { + s.Select(m) + } + } else if len(arg) == 1 { + s.Select(m, model.PLACE_UID, arg[0]) + } else { + s.Select(m.FieldsSetDetail(), s.Key(s, model.UID), arg[1]) + } + m.Display("") } -func init() { ice.Cmd(prefixKey(), event{}) } +func init() { ice.TeamCtxCmd(event{}) } -func (s event) Record(m *ice.Message, arg ...string) { - m.Cmd(s, s.Create, m.OptionSimple(model.USER_UID, model.PLACE_UID), ctx.INDEX, m.PrefixKey(), "operate", m.ActionKey(), ctx.ARGS, kit.Join(arg, ",")) +func (s event) Record(m *ice.Message, info string, arg ...string) { + m.Cmd(s, s.Create, m.OptionSimple(model.USER_UID, model.PLACE_UID), model.INFO, info, ctx.INDEX, m.PrefixKey(), model.OPERATE, m.ActionKey(), ctx.ARGS, kit.Join(arg, ",")) } diff --git a/src/gonganxitong/event.js b/src/gonganxitong/event.js index a437fb3..634abc3 100644 --- a/src/gonganxitong/event.js +++ b/src/gonganxitong/event.js @@ -6,7 +6,8 @@ Volcanos(chat.ONIMPORT, { {view: html.STATUS, list: [{text: value.uid.slice(0, 6)}, {text: can.base.TimeTrim(value.created_at)}]}, {view: html.STATUS, list: [{text: value.index}, {text: value.operate}]}, {view: html.STATUS, list: [{text: value.args}]}, - ], function() { can.Option("uid", value.uid), can.Update() }) + {view: html.OUTPUT, list: [{text: value.info}]}, + ]) })) }, }) \ No newline at end of file diff --git a/src/gonganxitong/express/common.go b/src/gonganxitong/express/common.go new file mode 100644 index 0000000..7adbc1d --- /dev/null +++ b/src/gonganxitong/express/common.go @@ -0,0 +1,8 @@ +package express + +import ( + "shylinux.com/x/community/src/gonganxitong" + _ "shylinux.com/x/community/src/gonganxitong/express/model" +) + +type Table struct{ gonganxitong.Table } diff --git a/src/gonganxitong/express/common.json b/src/gonganxitong/express/common.json new file mode 100644 index 0000000..b9d4329 --- /dev/null +++ b/src/gonganxitong/express/common.json @@ -0,0 +1,7 @@ +{ + "express": "寄快递", + "icons": { + "express": "https://img.icons8.com/officel/80/shipped.png" + }, + "value": {} +} \ No newline at end of file diff --git a/src/gonganxitong/express/express.go b/src/gonganxitong/express/express.go new file mode 100644 index 0000000..b7f18e7 --- /dev/null +++ b/src/gonganxitong/express/express.go @@ -0,0 +1,18 @@ +package express + +import ( + "shylinux.com/x/ice" + + "shylinux.com/x/community/src/gonganxitong" +) + +type express struct { + Table + portal gonganxitong.Portal +} + +func (s express) Init(m *ice.Message, arg ...string) { + s.portal.Show(m) +} + +func init() { ice.TeamCtxCmd(express{}) } diff --git a/src/gonganxitong/express/model/model.go b/src/gonganxitong/express/model/model.go new file mode 100644 index 0000000..dcbfc3d --- /dev/null +++ b/src/gonganxitong/express/model/model.go @@ -0,0 +1,12 @@ +package model + +import "shylinux.com/x/mysql-story/src/db" + +type Express struct { + db.ModelWithUID + FromPlaceUID string `gorm:"type:char(32);index"` + ToPlaceUID string `gorm:"type:char(32);index"` + Status uint8 +} + +func init() { db.CmdModels("", &Express{}) } diff --git a/src/gonganxitong/icons/apply.png b/src/gonganxitong/icons/apply.png new file mode 100644 index 0000000000000000000000000000000000000000..3500f1b813beda7c37f88f70a23b0aae750ac436 GIT binary patch literal 4840 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 literal 0 HcmV?d00001 diff --git a/src/gonganxitong/icons/house.png b/src/gonganxitong/icons/house.png new file mode 100644 index 0000000000000000000000000000000000000000..82c849382c3b3b8fb47903cc987089405b84f6fa GIT binary patch literal 6121 zcmYj#c_5Ts*uD&g!C+(`ObmwX#1I;cHAxFnQdvq_2bHXiEHjv4WQ}4-n=MP0>x{6_EZd%y3G=b7i3`&{Q-_jTX*InOzG8*4LekSK_WiHY079DR}TOJ!WO z>}-rXY;|CRiAm_a1={d(VAl7EP~YSCpEYgVkzGq%PkPMDob-P4UbAdNR$Q^%8@FTk zBfOQa70gXUj5kmp@gDXo6rH?(uuxq5Q}ex3^@o6scaHDIuL)EeBkxDux4&YdrBKVx z!og>RnlyrJzE}!#uprx-r(f9hDTq8b;e51kY{KNBd%-yM@qvztB)#g~C zb~CdlN$j2kv{b^-kiH*tx-=BW{o#X(ZHF^}8@XN1Kj41h-1UiXT2PHlB(K8T5alFNY3^i-#y>QTuuO#VgVdHU)KP$nN-@-V6@7W>4KxNyF5VpaiB8*2$A>?w*KMD z5zgjX?c0kNlFtjUw$m>)?s?9%e;C?L(P_ed)ePwTJzc(QS;ia!hhV#eSBKpz-VAr= zuWCxhs#i-a0P+&NC#pB(#MZ|=g@N?k`^$f}92{Tvp+pDf6x-8MuY@;ZOCk%L)!a0| z9}L>61vBv{x#Ckb%jGkf`6y(%d9;Yq-P@NcS(2o{0%j3^En>`SA~6cvBw>c-=@g(; zI7Z>~zc1NgqxkKINHkgf{0MM%?7j&RP|8+X8T zmwRj1aZNrdrWn^04D2?&+WUckV𝔧II7e{gabXQ+%N7a40TrUl2Efv^!{hZgVk< z$1AOtb|&nn2NC@QfFWfwmx{*3N?TB{)l?PiSAuaH$+3;`%!5T9J##Szn>B?2N2NC` zB8h%K*on?2c?103NACH0(J78}Q`p$r z*qpV%DT+xAe+&aR7RGXFekmI8gD%78(=^X^`e3j8rRnBvp>fF-yYKssMwUawE2!o( z0cA6|Dc(>8qO18gnI5aBtWwTD9_06Fo6#JzLq1FdZs`S1|E@B2@}`sI%Q0_|5XVfU zTH4Fgyt-#LGt2Q}q3Tt1n<#w9jU zemNS*4?->8;@h2&IWR4mt3qBbGp8<>9D;wY>PJeSm@;i)gv}e~LsuRO8~>1GVGlhB zJ@7621>fG;F&>FjPxtL%*)P6tNI*B(rOP~E{&h;C-K(j!Mtv!E#&68+YwevIdf=go zPj_wn{ZA1KIi2B~r&<+DMa>U75m_sw5@rWz(Vdbea{F0iSucW-(S9i*-&N0cvkej! zSmlXZS|y)kmST@`hE#ImHa-KTOw+1ax_n%hZ8px}>Hmrinhj8C$EX9@j_*fDO8$@B zWvGVJ@~N9273i-SdJvEFP~_FvXVk}Ejr}0F>=~OVwIf|00RCzgchu%Ns!Sein=Zvj zQ`b|8p7F*hz2=jT7MNDPZm1C>^^V#Me7yhT^hOsX>*6O@=zu$mvl^>e?@NuOgWm}) z9wi5YW=1d24C!1C_ReJrm^iS?Qt69}D^Jdd>j42zhP7|1%-FE%Lt0VyJhT%oC9mG` zy+YuBYIB_0rc#j=i?O^roVB!`C#lSVhQ5QD<#I;Sacv*Pe6MgQDh(GpFmnoCrY*kn zBp3^PHkU%myeTRwA+$}iLd!Jem6Wh|UOZwqGcMBy+ww{eutxZ3?l3ipBTF?$-_!U) zw#}eXQNL^)bXdWX2FI*f8A$~(IKV_1ctFl{%~(4b5lVobQ=uZ*b2D0v(p!qDX7GJ zn}A3h*}C1lvV3QT3T3F|W(=1M4G^yM93e=%kl0s7-rxG}3>}3u-$i?Ue`T`!s(1Z$ z(W6DdE52LYNM}2}!?hAa|Fb|M#DN3Ok9iZpXEAH5cduGBCe_4O^aSVZfTT)v#@75a z&fx^e_3GT^@tgO2;c1=7%OkuNE-svPo1c^yS65r_1U-<(Piq8ZA=dB{SVas@fd}85}LtePtQ0^x#?T*rf>2i@d=PM5+yV$fDqHrz`>SgRa5(vP^Nz@+yR;O`lsbB7SsFE;-iM z!rQS`A_)0d)Z9zZ42bc zwLq{dkFewIBs}V;glOawx%k7m56%M-&~!oxBEyJuxMl`G4qp4{%rQI1^IhonCFna< zG$Uk@h(xhFrnFZXI>=47`g>5FIX$qgtTc($Z&{pkrqR2}3MwO$N6wo85ohaSjRm$D z*-dC-)O;ESDYLH5J7Q4FzcZc=uzgyW5ILz)zo%>~TzdcSA}M+j z0Y>7D#Z{R3ywEi!c{g)vIn9hWq3xw#jQNL2>aG|EIv|6i(-rnEcTgR1m^qeHUB{d)^KIEP zrkp#wDc{B3-qbqGfa~Xyc7;{ewx<80t~=(8+CDfhR0;TITXp}1>@e$7k$m* zBrYhxs{VFQHvO`{2C-15az<%!Z;y)zag$2i`VOkw04`%$7z@}dsZxI609)>q?uAOW z&ADDLUsfJ~To)RK4yeH+5@GG+OYle@a zS{Reuby77S5byJg5v*_aA3<6ZXfd09K!)xQQRMw^%Qo#~buo^K$GIPd){_$Xj(5gq z*iM^5;SFl_TcU7;b|O6)67{OEX7TU zBj61z0?Eessri`I__#c<061x4fYgx^tfWvYfKR0^<+YRQIU8y>!n+_4EOajJ}P#bCeeA{e@Egp69b%X8)>`e z*psZbzJ;bLCJq&(8Qa>j663#*|2nZUwxdIAA-}q(;3iuUoU)|7fVV}VZ*>L5+?z_RbpZpp2mVD}*Fjv> z)xT5Xf^A&PWO`$SwoK z_}(AzHEVYaEU1&@_;5lK`CtW3+#VEV_fJFcjE*l_W6ytFQ+91o!YKs)nDigpKBTLUFjnr%_-RTEV*6h z7#mzWE5;X{YSpofp|4*djsMh;8V@G@+{KCxe`nZgh)lC(CDrd2@X)3^vS$#Co!8x# zl9VR(PixpKHD~ zRLO(l+tj*pU~Ct!vbeH;M|k(&OES{InLW!gPvt!TXHzm%Z=GcjL#DU63=1*Pm@ zxu$F}Cy8rK_($>d93G%ZeNdt&7hEzg2l+`Al3}2iQ$-V6Yk4c(vF;!>#S(D|dVPpf z6$y^P#OBsLu5}thTA{L!S!0ZgZI%}oqkDS`8ZTW)Nx0**lr{&?OUOtXDzKl9@hVS+*|-UXd~DO`?r6?w*;_kwvhyPOM>oTZJ={)NOM|( z5>vR2T!TKp*BvOk7%c|nbQsFHazHphd3PAslv`pFjb_@&_B<_E)l2H)>|XD=!|!5e zYAa_n>MvtMI1m5%!H-F7iSmA2^z1yZKdd|1iY<3_wcm%Mk{`E%&Jk?e&}xumtjP-C z$c&`7sEXRt517@&fF`AYnQ9!#omH84Z+kdP#}?^qx(J4Ib3Y5k-3k!e$v^AUN>a<~ zvNC5BNV{PnoAXacAlaU1_awNMff?auOAmB&aG+gX0#V!_c38sf=sE22rqWPzD$Xu7 zMW8r^h>EAfZUe~v;yXQTh|Uf<`Tk(Bpakg_Y-GIqU#K_G=t5mo@Z;y9yKu&i2>}k8 zQ}vg6|4Y3o_#85E8f9c!QC3*!tE3GeBjYC#1>G!uk_~?8c;jt_lz0G#$iSzvvX&3y zT#-&XXiVZ|tYUqB%V#_)mj1)o_{JsLfA}h9QvC(HPUf05VArh;ZsRpWR|IIJ;IcXx z?utIy^$GOFPnuT)!|MP`F!%_)-D@R|8_CY6|A&8#?QgdfD-y8=kn?Nw$v;82#A$Vx`BInEuZJqNAg_>!&Bhw2N8Zy?fP^BvU04CNU2F*Uv&W zBRQre-{R-o!}nm@8imkO^%gAq=P!pmSvvj_W*Ks|k1A~cW#GU;Sz;UeeV-FLa?5}h zG_cxt5d&j;_U!7-t=lsKB>7yiDhHXX4t93csUxVYcEj70t2dX!#Y)m6oPVW|Eco<-=ALJ#*9!|H_nMwVEf6Ax-Xa6z?8?H(duo4UsAb` z${FG4W}$E2@ZWo*80u>Gz@GmU@1D-~)_4n6II+j(Rkhj;w5AVZT)TIuKLKnx$K+}& zve~T!%$Gic%*+boePL{_8p-nB-9mglnT#Zo;hb#_ccd-e*xIC%&wjCGd@Yte&}_{$GyWg}%Dmp}XrGdMgvezUcmrhXnAG1;JV4TT3j^5p6fRJGBQ-cQ>~;6UyS< zul%|(_cTY+&v&+Xm2=_Nd!B@Ia%AK6Q>V%?ngPkA)a*r@I`<5IFh%As6S1P34zQx4 zg$?SY*5cBDkD@0+Sa%Q^wl5r#YF^RJILUx$&&T2Bm26?xDp%qggH%g({1s@;z%)97 z_!WuyBrG zSU~OIrr(`~(`Dz3TW@6%r_B=p7LcE)D^mY~>;N^Ys+worYCs0xFt8B$t!F(NPg*M^Sd> z148r|wDfpfX)V80AFgsiN92B+yQ!BjlgAu~KX*5iG;$wh>eXhQ)fCO?wb z(|bLM;oc_f* zFrH_bebeTBTPWc!Stz>;`pG*lBZK7X*uRSq>od?Ch&5!7-H_ tfD^4GJx-=63cl2HARhBshwx-yfC-sLh-s;+WE|l$S(sR(i;ZqZ{6EG}KSlrm literal 0 HcmV?d00001 diff --git a/src/gonganxitong/icons/office.png b/src/gonganxitong/icons/office.png new file mode 100644 index 0000000000000000000000000000000000000000..4fcb7d37068e3065a643698687fe412de09a86e6 GIT binary patch literal 4370 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 X*O1HNrX=uRhnVFa8}qzf$0Pp@WmTgu literal 0 HcmV?d00001 diff --git a/src/gonganxitong/icons/order.png b/src/gonganxitong/icons/order.png new file mode 100644 index 0000000000000000000000000000000000000000..00a4f28b128b31873fef978d0d32742b46caa45b GIT binary patch literal 4212 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.list>div.action div.item i { display:none; } $output>div.action div.item.button { margin-right:5px; } $output>div.action div.item.button input { border:none; color:var(--notice-bg-color); min-width:80px; float:left; } $output>div.action div.item.button span { display:none; } -$output>fieldset.qrcode table.content td { text-align:center; } \ No newline at end of file +$output>fieldset table.content td { box-shadow:none; } +$output>fieldset table.content tr.uid { display:none; } +$output>fieldset table.content tr.order_uid { display:none; } +$output>fieldset table.content tr.place_uid { display:none; } +$output>fieldset table.content td img { max-width:100%; } +$output>fieldset.qrcode table.content td { text-align:center; } +$output>fieldset.qrcode div.code { text-align:center; } +$output>fieldset.story { box-shadow:none; } \ No newline at end of file diff --git a/src/gonganxitong/portal.go b/src/gonganxitong/portal.go index c465883..8e0be44 100644 --- a/src/gonganxitong/portal.go +++ b/src/gonganxitong/portal.go @@ -16,12 +16,14 @@ type portal struct { userPlace userPlace place place street street + city city export string `data:"true"` short string `data:"index"` field string `data:"time,name,icons,index,order,enable,type,role"` + inputs string `name:"inputs" role:"void"` list string `name:"list place_uid index uid auto" role:"void"` - placeCreate string `name:"placeCreate street_uid*:select place_type*:select name* address*" role:"void"` - placeRemove string `name:"placeRemove place_uid*" role:"void"` + placeCreate string `name:"placeCreate city_name* street_name* place_type*:select name* address*" role:"void"` + placeRemove string `name:"placeRemove user_uid* place_uid* user_place_role*" role:"void"` scanQRCode string `name:"scanQRCode type text" role:"void"` } @@ -41,6 +43,8 @@ func (s portal) List(m *ice.Message, arg ...string) { } else if len(arg) == 1 { s.Hash.List(m, arg[1:]...).SortInt(mdb.ORDER) } else if len(arg) == 2 { + msg := m.Cmd(s.place, s.place.Select, model.UID, arg[0]) + m.Option(model.PLACE_NAME, msg.Append(model.NAME)) m.Cmdy(ctx.COMMAND, arg[1]).Push(ctx.ARGS, arg[0]) } else { m.FieldsSetDetail().Cmdy(arg[1], mdb.SELECT, model.UID, arg[2]).PushAction().Action() @@ -49,11 +53,10 @@ func (s portal) List(m *ice.Message, arg ...string) { } func (s portal) PlaceCreate(m *ice.Message, arg ...string) { defer m.ToastProcess()() - if m.WarnNotFound(m.Cmd(s.street, s.street.Select, model.UID, m.Option(model.STREET_UID)).Length() == 0, "street") { - return - } + s.city.FindOrCreateByName(m, arg...) + s.street.FindOrCreateByName(m, arg...) arg = kit.TransArgKeys(arg, model.PLACE_TYPE, model.TYPE) - if m.Cmdy(s.place, s.place.Create, arg).IsErr() { + if m.Cmdy(s.place, s.place.Create, arg[2:]).IsErr() { return } args := kit.Simple(model.USER_UID, m.Option(model.USER_UID), model.PLACE_UID, m.Result(), model.ROLE, UserPlaceCreator) @@ -62,12 +65,12 @@ func (s portal) PlaceCreate(m *ice.Message, arg ...string) { } func (s portal) PlaceRemove(m *ice.Message, arg ...string) { defer m.ToastProcess()() - args := kit.Simple(model.USER_UID, m.Option(model.USER_UID), model.PLACE_UID, m.Option(model.PLACE_UID)) + args := kit.Simple(model.USER_UID, m.Option(model.USER_UID), model.PLACE_UID, m.Option(model.PLACE_UID), model.ROLE, m.Option(model.USER_PLACE_ROLE)) msg := m.Cmd(s.userPlace, s.userPlace.Select, args) if m.WarnNotFound(msg.Length() == 0, "place") { return } - m.Cmdy(s.userPlace, s.userPlace.Delete, args) + m.Cmdy(s.userPlace, s.userPlace.Delete, msg.AppendSimple(model.UID)) if kit.Int(msg.Append(model.ROLE)) == kit.Int(UserPlaceCreator) { m.Cmdy(s.place, s.place.Delete, model.UID, m.Option(model.PLACE_UID)) } @@ -88,7 +91,7 @@ func (s portal) ScanQRCode(m *ice.Message, arg ...string) { } } -func init() { ice.Cmd(prefixKey(), portal{}) } +func init() { ice.TeamCtxCmd(portal{}) } type Portal struct { portal @@ -97,12 +100,12 @@ type Portal struct { field string `data:"time,name,icons,index,order,enable,type,role"` } -func init() { ice.Cmd(prefixKey(), Portal{}) } +func init() { ice.TeamCtxCmd(Portal{}) } func (s portal) Show(m *ice.Message, arg ...string) { m.GoSleep("30ms", func() { cmd := m.GetCommand() icon := kit.Select(cmd.Icon, kit.Value(cmd.Meta, kit.Keys(ice.CTX_ICONS, m.CommandKey()))) - m.Cmd(s, s.Create, mdb.NAME, cmd.Help, mdb.ICONS, icon, ctx.INDEX, m.PrefixKey()) + m.Cmd(s, s.Create, mdb.NAME, cmd.Help, mdb.ICONS, icon, ctx.INDEX, m.PrefixKey(), arg) }) } diff --git a/src/gonganxitong/portal.js b/src/gonganxitong/portal.js index b29b456..5a52662 100644 --- a/src/gonganxitong/portal.js +++ b/src/gonganxitong/portal.js @@ -9,15 +9,17 @@ Volcanos(chat.ONIMPORT, { {text: [can.user.transValue(can, value, PLACE_TYPE), "", mdb.TYPE]}, value.user_place_role != "creator" && {text: [can.user.transValue(can, value, "user_place_role"), "", aaa.ROLE]}, ]}, - {view: html.STATUS, list: [{text: value[PLACE_UID].slice(0, 8)}, {text: value.street_name}, {text: can.base.TimeTrim(value.created_at)}]}, + {view: html.STATUS, list: [ + {text: value[PLACE_UID].slice(0, 6)}, {text: can.base.TimeTrim(value.created_at)}, + {text: value.city_name}, {text: value.street_name}, + ]}, ] }, myPortal: function(can, msg, PLACE_UID, PLACE_NAME, title) { can.user.isMobile && can.isCmdMode() && can.onappend.style(can, html.OUTPUT) - can.db.hash = can.misc.SearchHash(can), can.sup.current = can.sup.current||{} + can.isCmdMode() && (can.db.hash = can.misc.SearchHash(can)) + can.sup.current = can.sup.current||{} if (can.Option(PLACE_UID) == "") { - if (can.db.hash.length > 1 && can.db.hash[0]) { - return can.Option(PLACE_UID, can.db.hash[0]), can.Option(ctx.INDEX, can.db.hash[1]), can.Update() - } + if (can.db.hash.length > 1 && can.db.hash[0]) { return can.Option(PLACE_UID, can.db.hash[0]), can.Option(ctx.INDEX, can.db.hash[1]), can.Update() } can.db.hash[0] && can.onexport.session(can, PLACE_UID, can.db.hash[0]) can.ui = can.page.Append(can, can._output, ["myplace.list", "myindex.list"]) can.page.Append(can, can.ui.myplace, [{view: html.TITLE, list: [{text: can.user.trans(can, "My Place", title)}], _init: function(target) { @@ -25,14 +27,18 @@ Volcanos(chat.ONIMPORT, { msg.Option(ice.MSG_ACTION) && can.onappend._action(can, msg.Option(ice.MSG_ACTION), target) }}]) }}]) + msg.Table(function(value) { var key = "_trans.value."+PLACE_NAME.replace("_name", "_type")+".icons." + msg.Push(mdb.ICONS, can.Conf(key+value.place_type)||can.Conf(key+"office")) + }) var uid = can.onimport.myPlace(can, msg, can.ui.myplace, PLACE_UID, PLACE_NAME) msg.Length() > 0 && can.run({}, [uid], function(msg) { can.page.Append(can, can.ui.myindex, [{view: html.TITLE, list: [{text: can.user.trans(can, "My Index", "我的应用")}]}]) for (var i = 0; i < 1; i++) { can.onimport.myIndex(can, msg, can.ui.myindex, PLACE_UID) } can.onimport.selectIndex(can, can.sup.current) }) + can.user.agent.init(can) } else { - can.onimport.myData(can, msg, can._output, PLACE_UID) + can.onimport.myData(can, msg, can._output, PLACE_UID, PLACE_NAME) } }, myPlace: function(can, msg, target, PLACE_UID, PLACE_NAME) { var place_uid @@ -78,17 +84,20 @@ Volcanos(chat.ONIMPORT, { }} })) }, - myData: function(can, msg, target, PLACE_UID) { + myData: function(can, msg, target, PLACE_UID, PLACE_NAME) { msg.Table(function(value) { function back() {} function refresh() {} var list = [can.page.button(can, can.user.trans(can, "goback", "返回"), function(event) { back() }), can.page.button(can, can.user.trans(can, "reload", "刷新"), function(event) { refresh() })] var ui = can.page.Append(can, can._output, [{view: html.ACTION}]) if (can.db.hash.length > 2 && can.db.hash[0] && can.db.hash[2]) { value.args = [can.db.hash[0], can.db.hash[2]] } value.style = html.OUTPUT, value.height = can.ConfHeight()-html.ACTION_HEIGHT - can.onexport.title(can, can.ConfHelp(), can.sup.current.place_name, value.help) + // can.onexport.title(can, value.help, can.user.trans(can, msg.Option("place_type"), null, "value.place_type"), msg.Option("place_name")) + can.onexport.title(can, value.help, msg.Option(PLACE_NAME)) can.onappend.plugin(can, value, function(sub) { refresh = function() { sub.Update() } - sub.onexport.output = function(_sub, msg) { can.user.toastSuccess(can, "load", "", 1000), can.onappend.style(sub, html.OUTPUT) + sub.Conf(PLACE_NAME, msg.Option(PLACE_NAME)) + sub.onexport.output = function(_sub, msg) { can.onappend.style(sub, html.OUTPUT) can.page.Appends(can, ui.action, list), msg.Option(ice.MSG_ACTION) && can.onappend._action(sub, msg.Option(ice.MSG_ACTION), ui.action, null, true) can.onexport.hash(can, can.Option(PLACE_UID), value.index, sub.Option(UID)) + can.user.agent.init(can, msg.Option("_share_content")||value.help, msg.Option("_share_icons")||value.icons) back = function() { if (sub.Option(UID)) { can.onexport.hash(can, can.Option(PLACE_UID), can.Option(ctx.INDEX)), sub.Option(UID, ""), sub.Update() diff --git a/src/gonganxitong/portal.json b/src/gonganxitong/portal.json index e9d681e..799d162 100644 --- a/src/gonganxitong/portal.json +++ b/src/gonganxitong/portal.json @@ -1,43 +1,50 @@ { - "user": "用户", - "place": "场所", - "street": "街道", "portal": "用户场所", "scanQRCode": "扫码添加", "placeCreate": "添加场所", "placeRemove": "删除场所", - "email": "邮箱配置", "qrcode": "场所码", - "event": "事件流", "apply": "申请单", "order": "审批单", + "event": "事件流", + "email": "邮箱配置", + "placeUser": "场所用户", + "cancel": "取消", + "submit": "提交", "reject": "驳回", "approve": "通过", "icons": { - "email": "usr/icons/Mail.png", - "qrcode": "usr/icons/Chess.png", "scanQRCode": "bi bi-qr-code-scan", - "placeCreate": "bi bi-plus-square-dotted" + "placeCreate": "bi bi-plus-square-dotted", + "qrcode": "https://img.icons8.com/officel/80/qr-code.png", + "apply": "https://img.icons8.com/officel/80/edit-property.png", + "order": "https://img.icons8.com/officel/80/receipt-approved.png", + "event": "https://img.icons8.com/officel/80/property-with-timer.png", + "email": "https://img.icons8.com/officel/80/reading-confirmation.png", + "placeUser": "https://img.icons8.com/officel/80/person-at-home.png" }, "style": { "placeRemove": "danger" }, "input": { - "address": "地址", - "open_id": "外键", - "user_uid": "用户", - "user_name": "用户名", - "user_place_role": "用户角色", + "city_uid": "城市", + "city_name": "城市名称", + "street_uid": "街道", + "street_name": "街道名称", "place_uid": "场所", "place_name": "场所名称", "place_type": "场所类型", "place_address": "场所地址", - "street_uid": "街道", - "street_name": "街道名称", + "user_place_role": "用户角色", + "user_uid": "用户", + "user_name": "用户昵称", + "user_avatar": "用户头像", "apply_status": "申请状态", "order_status": "审批状态", + "order_uid": "审批", "begin_time": "起始时间", - "end_time": "结束时间" + "end_time": "结束时间", + "operate": "操作" }, "value": { "place_type": { @@ -48,7 +55,17 @@ "school": "学校", "office": "办公", "factory": "工厂", - "hospital": "医院" + "hospital": "医院", + "icons": { + "house": "https://img.icons8.com/officel/80/cottage.png", + "hotel": "https://img.icons8.com/officel/80/5-star-hotel.png", + "store": "https://img.icons8.com/officel/80/online-store.png", + "public": "https://img.icons8.com/officel/80/university.png", + "school": "https://img.icons8.com/officel/80/classroom.png", + "office": "https://img.icons8.com/officel/80/building.png", + "factory": "https://img.icons8.com/officel/80/manufacturing.png", + "hospital": "https://img.icons8.com/officel/80/clinic.png" + } }, "user_place_role": { "creator": "创建人", diff --git a/src/gonganxitong/portal.shy b/src/gonganxitong/portal.shy new file mode 100644 index 0000000..b51013e --- /dev/null +++ b/src/gonganxitong/portal.shy @@ -0,0 +1,11 @@ +chapter "用户场所" +refer ` +ICON https://igoutu.cn/icons/officel +GORM https://gorm.io/docs/indexes.html +` + +field web.code.mysql.client +field web.code.mysql.query args `mysql gonganxitong` +field web.code.db.database +field web.code.db.driver +field web.code.db.models \ No newline at end of file diff --git a/src/gonganxitong/qrcode.go b/src/gonganxitong/qrcode.go index 445a78a..f30cefc 100644 --- a/src/gonganxitong/qrcode.go +++ b/src/gonganxitong/qrcode.go @@ -2,14 +2,15 @@ package gonganxitong import ( "shylinux.com/x/ice" + kit "shylinux.com/x/toolkits" "shylinux.com/x/community/src/gonganxitong/model" ) type qrcode struct { portal portal - user user userPlace userPlace + list string `name:"list place_uid uid auto" role:"void"` } func (s qrcode) Init(m *ice.Message, arg ...string) { @@ -18,9 +19,12 @@ func (s qrcode) Init(m *ice.Message, arg ...string) { func (s qrcode) List(m *ice.Message, arg ...string) { msg := m.Cmd(s.userPlace, m.Option(model.USER_UID), arg[0]) m.FieldsSetDetail() - m.Push(model.PLACE_NAME, msg.Append(model.PLACE_NAME)) - m.Push(model.PLACE_UID, arg[0]) + kit.For([]string{ + model.CITY_NAME, model.STREET_NAME, model.PLACE_NAME, model.PLACE_ADDRESS, + }, func(key string) { + m.Push(key, msg.Append(key)) + }) m.EchoQRCode(cmdurl(m, arg[0], m.Prefix("apply"))) } -func init() { ice.Cmd(prefixKey(), qrcode{}) } +func init() { ice.TeamCtxCmd(qrcode{}) } diff --git a/src/gonganxitong/sess.go b/src/gonganxitong/sess.go index 6d26de6..df791bd 100644 --- a/src/gonganxitong/sess.go +++ b/src/gonganxitong/sess.go @@ -22,10 +22,11 @@ func (s sess) Create(m *ice.Message, arg ...string) { func (s sess) Check(m *ice.Message, arg ...string) { msg := s.Table.Select(m.Spawn(), model.UID, arg[0]) msg = m.Cmd(s.user, s.user.Select, model.UID, msg.Append(model.USER_UID)) + m.Option(ice.MSG_USERROLE, aaa.VOID) m.Option(ice.MSG_USERNAME, msg.Append(model.UID)) m.Option(ice.MSG_USERNICK, msg.Append(model.NAME)) m.Option(ice.MSG_AVATAR, msg.Append(model.AVATAR)) m.Option(model.USER_UID, msg.Append(model.UID)) } -func init() { ice.Cmd(prefixKey(), sess{}) } +func init() { ice.TeamCtxCmd(sess{}) } diff --git a/src/gonganxitong/street.go b/src/gonganxitong/street.go index bde04b2..e722ee3 100644 --- a/src/gonganxitong/street.go +++ b/src/gonganxitong/street.go @@ -1,7 +1,20 @@ package gonganxitong -import "shylinux.com/x/ice" +import ( + "shylinux.com/x/ice" + + "shylinux.com/x/community/src/gonganxitong/model" +) type street struct{ Table } -func init() { ice.Cmd(prefixKey(), street{}) } +func (s street) FindOrCreateByName(m *ice.Message, arg ...string) { + if msg := m.Cmd(s, s.Select, model.CITY_UID, arg[1], model.NAME, arg[3]); msg.Length() == 0 { + msg := m.Cmd(s, s.Create, model.CITY_UID, arg[1], model.NAME, arg[3]) + arg[2], arg[3] = model.STREET_UID, msg.Result() + } else { + arg[2], arg[3] = model.STREET_UID, msg.Append(model.UID) + } +} + +func init() { ice.TeamCtxCmd(street{}) } diff --git a/src/gonganxitong/user.go b/src/gonganxitong/user.go index 256c011..2808027 100644 --- a/src/gonganxitong/user.go +++ b/src/gonganxitong/user.go @@ -22,15 +22,13 @@ func (s user) Create(m *ice.Message, arg ...string) { s.Table.Create(m, kit.Simple(m.OptionSimple(model.OPEN_ID, model.AVATAR), model.NAME, m.Option(aaa.USERNICK))...) m.Option(model.USER_UID, m.Result()) } else { + s.Table.Update(m, kit.Dict(m.OptionSimple(model.AVATAR), model.NAME, m.Option(aaa.USERNICK)), m.AppendSimple(model.UID)...) m.Option(model.USER_UID, m.Append(model.UID)) } } func (s user) Email(m *ice.Message, arg ...string) { - s.Table.Update(m, m.OptionSimple(model.EMAIL), model.UID, m.Option(model.USER_UID)) + s.Table.Update(m, kit.Dict(m.OptionSimple(model.EMAIL)), model.UID, m.Option(model.USER_UID)) } - -func init() { ice.Cmd(prefixKey(), user{}) } - func (s user) SendTemplate(m *ice.Message, arg ...string) { // uid url type name hash msg := s.Select(m, model.UID, arg[0]) m.Cmdy("web.chat.wx.template", "", m.Config("template"), msg.Append(model.OPEN_ID), kit.Select("", arg, 1), @@ -39,6 +37,8 @@ func (s user) SendTemplate(m *ice.Message, arg ...string) { // uid url type name ) } +func init() { ice.TeamCtxCmd(user{}) } + type User struct{ user } -func init() { ice.Cmd(prefixKey(), User{}) } +func init() { ice.TeamCtxCmd(User{}) } diff --git a/src/gonganxitong/userPlace.go b/src/gonganxitong/userPlace.go index 0a8d420..3ecc6ec 100644 --- a/src/gonganxitong/userPlace.go +++ b/src/gonganxitong/userPlace.go @@ -10,27 +10,34 @@ type userPlace struct { Table place place street street - create string `name:"create user_uid* place_uid* role*"` + city city + create string `name:"create user_uid* place_uid* role* begin_time end_time"` list string `name:"list user_uid place_uid auto"` } func (s userPlace) List(m *ice.Message, arg ...string) { - s.Tables(m, s.place, s.street).Fields(m, "user_places.created_at", - model.USER_UID, model.PLACE_UID, + s.Tables(m, s.place, s.street, s.city).Fields(m, "user_places.created_at", "user_places.id", model.PLACE_NAME, model.PLACE_TYPE, model.USER_PLACE_ROLE, - model.STREET_NAME, model.PLACE_ADDRESS, - ).Orders(m, "user_places.id DESC") + model.CITY_NAME, model.STREET_NAME, model.PLACE_ADDRESS, + model.USER_UID, model.PLACE_UID, + ).Orders(m, "created_at DESC") if len(arg) == 0 { - s.Select(m) + if m.IsTech() { + s.Select(m) + } } else if len(arg) == 1 { s.Select(m, model.USER_UID, arg[0]) } else { - s.Select(m.FieldsSetDetail(), model.USER_UID, arg[0], model.PLACE_UID, arg[1]) + s.Select(m.FieldsSetDetail(), model.PLACE_UID, arg[1]) } s.RewriteAppend(m) } -func init() { ice.Cmd(prefixKey(), userPlace{}) } +func init() { ice.TeamCtxCmd(userPlace{}) } + +type UserPlace struct{ userPlace } + +func init() { ice.TeamCtxCmd(UserPlace{}) } type UserPlaceRole int diff --git a/src/main.go b/src/main.go index b4262b8..73d74e3 100644 --- a/src/main.go +++ b/src/main.go @@ -4,6 +4,7 @@ import ( "shylinux.com/x/ice" _ "shylinux.com/x/community/src/gonganxitong" + _ "shylinux.com/x/community/src/gonganxitong/express" ) func main() { print(ice.Run()) } diff --git a/src/template/web.code.autogen/demo.go b/src/template/web.code.autogen/demo.go index 4c052ab..676d21e 100644 --- a/src/template/web.code.autogen/demo.go +++ b/src/template/web.code.autogen/demo.go @@ -10,4 +10,4 @@ func (s {{.Option "name"}}) List(m *ice.Message, arg ...string) { s.Table.List(m, arg...) } -func init() { ice.Cmd(prefixKey(), {{.Option "name"}}{}) } +func init() { ice.TeamCtxCmd({{.Option "name"}}{}) }