From 1fa505bbf3b926c74dceafd417880f8c1d1b2407 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sat, 8 Oct 2022 03:02:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=BA=97=E4=B8=9A=E7=BB=A9=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...UniversalJosServiceCampaignQueryRequest.cs | 169 +++++++ ...niversalJosServiceCampaignQueryResponse.cs | 16 + .../Statistics/StatisticsBusiness.cs | 93 ++-- BBWY.Test/Program.cs | 50 +- ...数据库-backup-2022107163441.pdma.json} | 433 +++++++++++++++--- ...数据库-backup-2022107165015.pdma.json} | 193 ++++++-- ...数据库-backup-2022107165016.pdma.json} | 420 ++++++++++++++--- doc/步步为盈数据库.pdma.json | 2 +- 8 files changed, 1112 insertions(+), 264 deletions(-) create mode 100644 BBWY.JDSDK/Request/AdsIbgUniversalJosServiceCampaignQueryRequest.cs create mode 100644 BBWY.JDSDK/Response/AdsIbgUniversalJosServiceCampaignQueryResponse.cs rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2022103140549.pdma.json => 步步为盈数据库-backup-2022107163441.pdma.json} (97%) rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2022103140805.pdma.json => 步步为盈数据库-backup-2022107165015.pdma.json} (99%) rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2022103140547.pdma.json => 步步为盈数据库-backup-2022107165016.pdma.json} (97%) diff --git a/BBWY.JDSDK/Request/AdsIbgUniversalJosServiceCampaignQueryRequest.cs b/BBWY.JDSDK/Request/AdsIbgUniversalJosServiceCampaignQueryRequest.cs new file mode 100644 index 00000000..7cf07079 --- /dev/null +++ b/BBWY.JDSDK/Request/AdsIbgUniversalJosServiceCampaignQueryRequest.cs @@ -0,0 +1,169 @@ +using System; +using System.Collections.Generic; +using Jd.Api.Response; +using Jd.Api.Util; +namespace Jd.Api.Request +{ + public class AdsIbgUniversalJosServiceCampaignQueryRequest : JdRequestBase + { + public string + campaignType + {get; set;} + + public string + scenarioType + {get; set;} + + public string + giftFlag + {get; set;} + + public string + campaignId + {get; set;} + + public string + startDay + {get; set;} + + public string + orderStatusCategory + {get; set;} + + public string + pageSize + {get; set;} + + public string + mediaType + {get; set;} + + public string + filters + {get; set;} + + public string + impressionOrClickEffect + {get; set;} + + public string + platform + {get; set;} + + public string + endDay + {get; set;} + + public string + clickOrOrderDay + {get; set;} + + public string + isDaily + {get; set;} + + public string + page + {get; set;} + + public string + clickOrOrderCaliber + {get; set;} + + public string + campaignName + {get; set;} + + public string + campaignIds + {get; set;} + + public string + businessType + {get; set;} + + public string + accessPin + {get; set;} + + public string + authType + {get; set;} + + public string + deliverySystemType + {get; set;} + + public string + jdMediaUserId + {get; set;} + + public string + granularity + {get; set;} + + public override string ApiName + { + get{return "jingdong.ads.ibg.UniversalJosService.campaign.query";} + } + protected override void PrepareParam(IDictionary parameters) + { + parameters.Add("campaignType", this. campaignType +); + parameters.Add("scenarioType", this. scenarioType +); + parameters.Add("giftFlag", this. giftFlag +); + parameters.Add("campaignId", this. campaignId +); + parameters.Add("startDay", this. startDay +); + parameters.Add("orderStatusCategory", this. orderStatusCategory +); + parameters.Add("pageSize", this. pageSize +); + parameters.Add("mediaType", this. mediaType +); + parameters.Add("filters", this. filters +); + parameters.Add("impressionOrClickEffect", this. impressionOrClickEffect +); + parameters.Add("platform", this. platform +); + parameters.Add("endDay", this. endDay +); + parameters.Add("clickOrOrderDay", this. clickOrOrderDay +); + parameters.Add("isDaily", this. isDaily +); + parameters.Add("page", this. page +); + parameters.Add("clickOrOrderCaliber", this. clickOrOrderCaliber +); + parameters.Add("campaignName", this. campaignName +); + parameters.Add("campaignIds", this. campaignIds +); + parameters.Add("businessType", this. businessType +); + parameters.Add("accessPin", this. accessPin +); + parameters.Add("authType", this. authType +); + parameters.Add("deliverySystemType", this. deliverySystemType +); + parameters.Add("jdMediaUserId", this. jdMediaUserId +); + parameters.Add("granularity", this. granularity +); + } + } +} + + + + + + + + diff --git a/BBWY.JDSDK/Response/AdsIbgUniversalJosServiceCampaignQueryResponse.cs b/BBWY.JDSDK/Response/AdsIbgUniversalJosServiceCampaignQueryResponse.cs new file mode 100644 index 00000000..4f7d6a69 --- /dev/null +++ b/BBWY.JDSDK/Response/AdsIbgUniversalJosServiceCampaignQueryResponse.cs @@ -0,0 +1,16 @@ +using System; +using System.Xml.Serialization; +using System.Collections.Generic; +using Newtonsoft.Json; + using Jd.Api.Domain; + namespace Jd.Api.Response +{ + +public class AdsIbgUniversalJosServiceCampaignQueryResponse:JdResponse{ + [JsonProperty("returnType")] +public ResponseMessage + + returnType + { get; set; } + } +} diff --git a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs index 1d810b91..607f027f 100644 --- a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs +++ b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs @@ -85,66 +85,57 @@ namespace BBWY.Server.Business }).ToList(); } - //var shopId = request.ShopId.ToString(); - //var mdsShop = freeSqlMultiDBManager.MDSfsql.Select().Where(s => s.ShopId == shopId).ToOne(); - //if (mdsShop != null) - //{ - // var advCost = freeSqlMultiDBManager.JDXXfsql.Select().Where(s => s.ShopsId == mdsShop.Id && - // s.CreateTime >= request.StartTime && - // s.CreateTime <= request.EndTime) - // .ToAggregate(s => s.Sum(s.Key.ExpressCost + s.Key.ShotgunCost)); - // response.AdvCost = advCost; - // response.Profit -= advCost; - //} + response.ShopId = request.ShopId; return response; } public IList GetOrderAchievementStatisticsList(AllShopOrderAchievementRequest request) { + var minTime = DateTime.Parse("2022-05-01"); + if (request.StartTime < minTime) + request.StartTime = minTime; request.EndTime = request.EndTime.Date.AddDays(1).AddSeconds(-1); - var responseList = fsql.Select().LeftJoin((o, oc) => o.Id == oc.OrderId) - .Where((o, oc) => o.OrderState != null && - !invalidOrderStateList.Contains(o.OrderState.Value) && //排除待付款和取消 - o.StartTime >= request.StartTime && - o.StartTime <= request.EndTime) - .GroupBy((o, oc) => o.ShopId) - .ToList((g) => new OrderAchievementResponse() - { - ShopId = g.Key, - OrderCount = g.Count(g.Value.Item1.Id), - Profit = g.Sum(g.Value.Item2.Profit), - SaleAmount = g.Sum(g.Value.Item1.OrderPayment), - DeliveryExpressFreight = g.Sum(g.Value.Item2.DeliveryExpressFreight), - PlatformCommissionAmount = g.Sum(g.Value.Item2.PlatformCommissionAmount), - PurchaseAmount = g.Sum(g.Value.Item2.PurchaseAmount) - }); - var mdsShops = freeSqlMultiDBManager.MDSfsql.Select().Where(s => !string.IsNullOrEmpty(s.ShopId)).ToList(); - var mdsShopIds = mdsShops.Select(s => s.Id); - var advCosts = freeSqlMultiDBManager.JDXXfsql.Select().Where(s => mdsShopIds.Contains(s.ShopsId) && - s.CreateTime >= request.StartTime && - s.CreateTime <= request.EndTime) - .GroupBy(s => s.ShopsId) - .ToList(g => new - { - ShopId = g.Key, - AdvCost = g.Sum(g.Value.ExpressCost + g.Value.ShotgunCost) - }); - foreach (var response in responseList) + List list = new List(); + var shopPularizeGroups = fsql.Select().Where(s => s.Date >= request.StartTime && s.Date <= request.EndTime) + .GroupBy(s => s.ShopId) + .ToList(g => new + { + ShopId = g.Key, + MinDate = g.Min(g.Value.Date), + MaxDate = g.Max(g.Value.Date), + Cost = g.Sum(g.Value.Cost) + }); + + var shopPularizeDateGroups = shopPularizeGroups.GroupBy(g => new { g.MinDate, g.MaxDate }).ToList(); + foreach (var dateGroup in shopPularizeDateGroups) { - string shopId = response.ShopId.ToString(); - var mdsShop = mdsShops.FirstOrDefault(s => s.ShopId == shopId); - if (mdsShop == null) - continue; - - var advCostResponse = advCosts.FirstOrDefault(a => a.ShopId == mdsShop.Id); - if (advCostResponse == null) - continue; - - response.AdvCost = advCostResponse.AdvCost; - response.Profit -= advCostResponse.AdvCost; + var minDate = dateGroup.Key.MinDate; + var maxDate = dateGroup.Key.MaxDate.Value.Date.AddDays(1).AddSeconds(-1); + var shopIds = dateGroup.Select(g => g.ShopId).ToList(); + + var responseList = fsql.Select().LeftJoin((o, oc) => o.Id == oc.OrderId) + .Where((o, oc) => o.OrderState != null && + !invalidOrderStateList.Contains(o.OrderState.Value) && //排除待付款和取消 + o.StartTime >= minDate && + o.StartTime <= maxDate && + shopIds.Contains(o.ShopId)) + .GroupBy((o, oc) => o.ShopId) + .ToList((g) => new OrderAchievementResponse() + { + ShopId = g.Key, + Profit = g.Sum(g.Value.Item2.Profit) + }); + foreach (var r in responseList) + { + var shopPularize = shopPularizeGroups.FirstOrDefault(s => s.ShopId == r.ShopId); + if (shopPularize != null) + r.Profit -= shopPularize.Cost; + } + list.AddRange(responseList); } - return responseList; + + return list; } private void XingXiangCumulative(IList detailList, string spuId, bool isSD, decimal profit, decimal sdProductAmount, decimal sdCost) diff --git a/BBWY.Test/Program.cs b/BBWY.Test/Program.cs index 593992b5..fee5b45c 100644 --- a/BBWY.Test/Program.cs +++ b/BBWY.Test/Program.cs @@ -26,32 +26,36 @@ namespace BBWY.Test { var appkey = "120EA9EC65AB017567D78CC1139EEEA5"; var appSecret = "866a9877f5f24b03b537483b4defe75d"; - var token = "2ace3023200c4ea9aa682bbf8bffee18jztm";//"2ace3023200c4ea9aa682bbf8bffee18jztm"; + var token = "b46065ef5b894f2297686e28d39cb37a2mdy";//"2ace3023200c4ea9aa682bbf8bffee18jztm"; - var startDate = DateTime.Parse("2022-07-06"); - var endDate = DateTime.Parse("2022-10-05"); - var jdClient = GetJdClient(appkey, appSecret); + IJdClient client = GetJdClient(appkey, appSecret); - var req = new DspPlatformFinanceOpenapiQuerycostdetailsRequest(); - req.beginDate = startDate.ToString("yyyy-MM-dd"); - req.endDate = endDate.ToString("yyyy-MM-dd"); - req.pageNo = 1; - req.pageSize = 100; - req.moneyType = 1; + var req5 = new AdsIbgUniversalJosServiceCampaignQueryRequest(); + req5.startDay = "2022-10-05"; + req5.endDay = "2022-10-05"; + req5.businessType = "2"; + req5.accessPin = "腾奇666"; + req5.clickOrOrderDay = "0"; + req5.giftFlag = "0"; + req5.clickOrOrderCaliber = "1"; + //req.isDaily = ""; + AdsIbgUniversalJosServiceCampaignQueryResponse response5 = client.Execute(req5, token, DateTime.Now.ToLocalTime()); + Console.WriteLine(JsonConvert.SerializeObject(response5)); - //var req = new AdsIbgUniversalJosServiceSkuQueryRequest(); - //req.businessType = "134217728"; - //req.clickOrOrderCaliber = "1"; - //req.clickOrOrderDay = "0"; - //req.clickStartDay = "2022-09-25"; - //req.clickEndDay = "2022-09-25"; - //req.orderStartDay = "2022-09-25"; - //req.orderEndDay = "2022-09-25"; - //req.startDay = "2022-09-25"; - //req.endDay = "2022-09-25"; - //req.accessPin = "ecmax2017"; - var response = jdClient.Execute(req, token, DateTime.Now.ToLocalTime()); - Console.WriteLine(JsonConvert.SerializeObject(response)); + + Console.WriteLine("-------------------------------------------------"); + + var req6 = new AdsIbgUniversalJosServiceCampaignQueryRequest(); + req6.startDay = "2022-10-06"; + req6.endDay = "2022-10-06"; + req6.businessType = "2"; + req6.accessPin = "腾奇666"; + req6.clickOrOrderDay = "0"; + req6.giftFlag = "0"; + req6.clickOrOrderCaliber = "1"; + //req.isDaily = ""; + AdsIbgUniversalJosServiceCampaignQueryResponse response6 = client.Execute(req6, token, DateTime.Now.ToLocalTime()); + Console.WriteLine(JsonConvert.SerializeObject(response6)); Console.ReadKey(); } } diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2022103140549.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2022107163441.pdma.json similarity index 97% rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2022103140549.pdma.json rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2022107163441.pdma.json index 947c01ef..8118e687 100644 --- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2022103140549.pdma.json +++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2022107163441.pdma.json @@ -4,12 +4,12 @@ "avatar": "", "version": "4.1.3", "createdTime": "2022-10-3 12:39:39", - "updatedTime": "2022-10-3 14:05:47", + "updatedTime": "2022-10-3 14:08:05", "dbConns": [], "profile": { "default": { "db": "29D1CE08-4C35-4D2D-AAA9-23D93305B52E", - "dbConn": "86F2F675-C4C0-4D66-8170-82D00E033C3B", + "dbConn": "AA9364B4-6488-4476-B580-D7F1845CCA32", "entityInitFields": [ { "defKey": "TENANT_ID", @@ -1341,7 +1341,7 @@ "notNull": true, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "88311B02-719F-45ED-9603-84EEA4F6F802", "extProps": {} @@ -1358,7 +1358,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "F38B8E9C-1AEE-421F-A7FF-AE124B8A411D", "extProps": {} @@ -1392,7 +1392,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "B5836504-AEBF-4837-A5B3-27F8B2D84577", "extProps": {} @@ -1409,7 +1409,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "2AF9499E-33C7-4254-BAB5-7E762F45384C", "extProps": {} @@ -1426,7 +1426,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "C6EB2532-EF98-4E10-912A-24E84A3BBAF8", "extProps": {} @@ -1443,7 +1443,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "53A55057-9285-47A9-A643-1D2EC8E9CF9A", "extProps": {} @@ -1460,7 +1460,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "17EF80CF-F695-4AEA-A834-43E7FA925E26", "extProps": {} @@ -2237,6 +2237,14 @@ "myRows": "n", "refRows": "1", "innerType": "" + }, + { + "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "refEntity": "30E9507B-707C-4BCF-99F2-104066BCC3F9", + "refField": "88311B02-719F-45ED-9603-84EEA4F6F802", + "myRows": "n", + "refRows": "1", + "innerType": "" } ] }, @@ -5731,6 +5739,22 @@ "myRows": "n", "refRows": "1", "innerType": "" + }, + { + "myField": "3F567BD5-256D-4843-ADDF-0805BE706112", + "refEntity": "30E9507B-707C-4BCF-99F2-104066BCC3F9", + "refField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7", + "myRows": "n", + "refRows": "1", + "innerType": "" + }, + { + "myField": "3F567BD5-256D-4843-ADDF-0805BE706112", + "refEntity": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", + "refField": "93852E9B-AD50-40B6-A131-B62EFFE3438C", + "myRows": "n", + "refRows": "1", + "innerType": "" } ] }, @@ -6056,7 +6080,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF", + "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", + "refField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E", + "myRows": "n", + "refRows": "1", + "innerType": "" + } + ] }, { "id": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", @@ -6303,7 +6336,24 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", + "refEntity": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", + "refField": "98F8F005-A630-4C98-8C1F-ECCA64E65996", + "myRows": "n", + "refRows": "1", + "innerType": "" + }, + { + "myField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", + "refEntity": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", + "refField": "61C58DEB-2779-451F-82AD-3B03BC9C795D", + "myRows": "n", + "refRows": "1", + "innerType": "" + } + ] }, { "id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", @@ -6516,7 +6566,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "41BFEC37-8F13-42D0-B8ED-123071447D18", + "refEntity": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", + "refField": "4C09B365-4B2A-4613-9133-DF0421BFC85C", + "myRows": "n", + "refRows": "1", + "innerType": "" + } + ] }, { "id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", @@ -7559,6 +7618,12 @@ "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%out" }, "relation": "1:n", + "vertices": [ + { + "x": 520, + "y": 0 + } + ], "fillColor": "#ACDAFC", "router": { "name": "manhattan" @@ -7576,6 +7641,12 @@ "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%out" }, "relation": "1:n", + "vertices": [ + { + "x": 510, + "y": 120 + } + ], "fillColor": "#ACDAFC", "router": { "name": "manhattan" @@ -7627,6 +7698,12 @@ "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%in" }, "relation": "1:n", + "vertices": [ + { + "x": -10, + "y": 140 + } + ], "fillColor": "#ACDAFC", "router": { "name": "manhattan" @@ -7644,6 +7721,12 @@ "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%out" }, "relation": "1:n", + "vertices": [ + { + "x": 520, + "y": 260 + } + ], "fillColor": "#ACDAFC", "router": { "name": "manhattan" @@ -7667,15 +7750,15 @@ } }, { - "id": "0096fe4e-1e80-427c-9549-8575d651101b", + "id": "7507bd81-c9aa-4396-9915-767aad52d2c9", "shape": "erdRelation", "source": { - "cell": "6eba7e01-588a-4631-a8a3-9eb43b950339", - "port": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3%out" + "cell": "da49dd57-b256-4f89-9653-8f35edef5a02", + "port": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE%in" }, "target": { - "cell": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", - "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%in" + "cell": "e417b0e0-85e2-4073-977c-60fe6a7479ae", + "port": "0EE3108C-0995-4D82-AA03-FF63F0D62626%in" }, "relation": "1:n", "fillColor": "#ACDAFC", @@ -7684,15 +7767,15 @@ } }, { - "id": "7507bd81-c9aa-4396-9915-767aad52d2c9", + "id": "f25165ac-bb9e-441b-8649-9256e7274726", "shape": "erdRelation", "source": { - "cell": "da49dd57-b256-4f89-9653-8f35edef5a02", - "port": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE%in" + "cell": "33dd1974-86a6-4344-9c56-ed081a79fa7f", + "port": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9%in" }, "target": { - "cell": "e417b0e0-85e2-4073-977c-60fe6a7479ae", - "port": "0EE3108C-0995-4D82-AA03-FF63F0D62626%in" + "cell": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", + "port": "1012CEB5-702E-428F-ABEF-17BD9856E4E3%out" }, "relation": "1:n", "fillColor": "#ACDAFC", @@ -7701,15 +7784,15 @@ } }, { - "id": "f25165ac-bb9e-441b-8649-9256e7274726", + "id": "bc232bfc-31b6-45ad-aab1-265c17652b95", "shape": "erdRelation", "source": { - "cell": "33dd1974-86a6-4344-9c56-ed081a79fa7f", - "port": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9%in" + "cell": "c59993ba-6d74-4c9d-9340-a2a882ca2cea", + "port": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E%in" }, "target": { - "cell": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", - "port": "1012CEB5-702E-428F-ABEF-17BD9856E4E3%out" + "cell": "f16da34e-971e-49b6-b69c-db827c1fef59", + "port": "6F03B0D9-DECD-45A0-B0F5-1921289472EF%in" }, "relation": "1:n", "fillColor": "#ACDAFC", @@ -7718,14 +7801,77 @@ } }, { - "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", + "id": "d9d4162e-7ca7-4f67-b5e1-a0f2e4baa7de", + "shape": "erdRelation", + "source": { + "cell": "6fb8d8fb-7123-4c14-bb4a-a3cd11272a41", + "port": "98F8F005-A630-4C98-8C1F-ECCA64E65996%in" + }, + "target": { + "cell": "c59993ba-6d74-4c9d-9340-a2a882ca2cea", + "port": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF%in" + }, + "relation": "1:n", + "vertices": [ + { + "x": 1390, + "y": 241 + } + ], + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, + { + "id": "363d51ce-9dba-4c49-aa13-2c6c7284c71a", + "shape": "erdRelation", + "source": { + "cell": "2be3d363-8b94-4f0b-a4b4-f38b9039240a", + "port": "61C58DEB-2779-451F-82AD-3B03BC9C795D%in" + }, + "target": { + "cell": "c59993ba-6d74-4c9d-9340-a2a882ca2cea", + "port": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF%in" + }, + "relation": "1:n", + "vertices": [ + { + "x": 1360, + "y": 270 + } + ], + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, + { + "id": "11207adc-a74c-42cc-ae45-8ac628dce957", + "shape": "erdRelation", + "source": { + "cell": "2be3d363-8b94-4f0b-a4b4-f38b9039240a", + "port": "4C09B365-4B2A-4613-9133-DF0421BFC85C%in" + }, + "target": { + "cell": "6fb8d8fb-7123-4c14-bb4a-a3cd11272a41", + "port": "41BFEC37-8F13-42D0-B8ED-123071447D18%in" + }, + "relation": "1:n", + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, + { + "id": "ddf927a6-e081-4c05-937d-bc64f59fc32a", "shape": "table", "position": { - "x": -505, - "y": 520 + "x": 1220, + "y": -523 }, "count": 0, - "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" + "originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E" }, { "id": "3de2bd13-2384-4816-85e5-dcf4240a6cb7", @@ -7738,54 +7884,84 @@ "originKey": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1" }, { - "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5", "shape": "table", "position": { - "x": 30, - "y": 487 + "x": 560, + "y": 140 }, "count": 0, - "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" + "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E" }, { - "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", + "id": "da49dd57-b256-4f89-9653-8f35edef5a02", "shape": "table", "position": { - "x": 30, - "y": 80 + "x": 1220, + "y": -805 }, "count": 0, - "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" + "originKey": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9" }, { - "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", + "id": "e417b0e0-85e2-4073-977c-60fe6a7479ae", "shape": "table", "position": { - "x": -461, - "y": 180 + "x": 1220, + "y": -1057 }, "count": 0, - "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" + "originKey": "6036D7E4-7ECB-4888-9D74-58DA414447F8" }, { - "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", + "id": "c59993ba-6d74-4c9d-9340-a2a882ca2cea", "shape": "table", "position": { - "x": -1054, - "y": -190 + "x": 1430, + "y": 201 }, "count": 0, - "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" + "originKey": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32" }, { - "id": "33dd1974-86a6-4344-9c56-ed081a79fa7f", + "id": "f16da34e-971e-49b6-b69c-db827c1fef59", "shape": "table", "position": { - "x": -560, + "x": 1430, + "y": 71 + }, + "count": 0, + "originKey": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE" + }, + { + "id": "6fb8d8fb-7123-4c14-bb4a-a3cd11272a41", + "shape": "table", + "position": { + "x": 1430, + "y": 470 + }, + "count": 0, + "originKey": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A" + }, + { + "id": "2be3d363-8b94-4f0b-a4b4-f38b9039240a", + "shape": "table", + "position": { + "x": 1430, + "y": 695 + }, + "count": 0, + "originKey": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2" + }, + { + "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", + "shape": "table", + "position": { + "x": -1054, "y": -190 }, "count": 0, - "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" + "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" }, { "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431", @@ -7808,54 +7984,160 @@ "originKey": "379D48BE-3522-413B-8FA3-752D65ADB597" }, { - "id": "e417b0e0-85e2-4073-977c-60fe6a7479ae", + "id": "653f38d3-e9ff-4fb9-b1c1-f88b6b751d9a", + "shape": "erdRelation", + "source": { + "cell": "6eba7e01-588a-4631-a8a3-9eb43b950339", + "port": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3%in" + }, + "target": { + "cell": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", + "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%in" + }, + "relation": "1:n", + "vertices": [ + { + "x": -20, + "y": 120 + } + ], + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, + { + "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c", "shape": "table", "position": { - "x": 1220, - "y": -1057 + "x": -450.5, + "y": -368 }, "count": 0, - "originKey": "6036D7E4-7ECB-4888-9D74-58DA414447F8" + "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213" }, { - "id": "da49dd57-b256-4f89-9653-8f35edef5a02", + "id": "ecef0fdf-c5f8-4347-bd26-010ccf106255", + "shape": "erdRelation", + "source": { + "cell": "fa539400-f09d-485c-af47-7055dd7beeaa", + "port": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7%out" + }, + "target": { + "cell": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "port": "3F567BD5-256D-4843-ADDF-0805BE706112%in" + }, + "relation": "1:n", + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, + { + "id": "e00146ac-7fc6-4c53-a0ad-83afe9380003", + "shape": "erdRelation", + "source": { + "cell": "fa539400-f09d-485c-af47-7055dd7beeaa", + "port": "88311B02-719F-45ED-9603-84EEA4F6F802%out" + }, + "target": { + "cell": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", + "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%in" + }, + "relation": "1:n", + "vertices": [ + { + "x": -20, + "y": 320 + } + ], + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, + { + "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", "shape": "table", "position": { - "x": 1220, - "y": -805 + "x": 30, + "y": 80 }, "count": 0, - "originKey": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9" + "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" }, { - "id": "f16da34e-971e-49b6-b69c-db827c1fef59", + "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", "shape": "table", "position": { - "x": 1430, - "y": 80 + "x": 30, + "y": -302 }, "count": 0, - "originKey": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE" + "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" }, { - "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5", + "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", "shape": "table", "position": { - "x": 560, - "y": 140 + "x": -461, + "y": 180 }, "count": 0, - "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E" + "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" }, { - "id": "c59993ba-6d74-4c9d-9340-a2a882ca2cea", + "id": "28d4a60a-591b-40e2-805d-a3d95071da04", + "shape": "erdRelation", + "source": { + "cell": "33dd1974-86a6-4344-9c56-ed081a79fa7f", + "port": "93852E9B-AD50-40B6-A131-B62EFFE3438C%out" + }, + "target": { + "cell": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "port": "3F567BD5-256D-4843-ADDF-0805BE706112%in" + }, + "relation": "1:n", + "vertices": [ + { + "x": -40, + "y": 688 + } + ], + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, + { + "id": "33dd1974-86a6-4344-9c56-ed081a79fa7f", "shape": "table", "position": { - "x": 1430, - "y": 201 + "x": -560, + "y": -190 }, "count": 0, - "originKey": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32" + "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" + }, + { + "id": "fa539400-f09d-485c-af47-7055dd7beeaa", + "shape": "table", + "position": { + "x": -560, + "y": 527 + }, + "count": 0, + "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9" + }, + { + "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "shape": "table", + "position": { + "x": 30, + "y": 487 + }, + "count": 0, + "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" } ] }, @@ -8103,6 +8385,17 @@ "password": "kaicn1132+-", "username": "qyroot" } + }, + { + "defKey": "AA9364B4-6488-4476-B580-D7F1845CCA32", + "defName": "球盘DB", + "type": "29D1CE08-4C35-4D2D-AAA9-23D93305B52E", + "properties": { + "driver_class_name": "com.mysql.cj.jdbc.Driver", + "url": "jdbc:mysql://120.241.79.72:7336/sports?characterEncoding=UTF-8&useSSL=false&useUnicode=true&serverTimezone=UTC", + "password": "8532b3cd0aac1f18", + "username": "root" + } } ] } \ No newline at end of file diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2022103140805.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2022107165015.pdma.json similarity index 99% rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2022103140805.pdma.json rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2022107165015.pdma.json index 0904d429..d545b2e7 100644 --- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2022103140805.pdma.json +++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2022107165015.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.1.3", "createdTime": "2022-10-3 12:39:39", - "updatedTime": "2022-10-3 14:05:49", + "updatedTime": "2022-10-7 16:34:41", "dbConns": [], "profile": { "default": { @@ -2237,6 +2237,14 @@ "myRows": "n", "refRows": "1", "innerType": "" + }, + { + "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "refEntity": "30E9507B-707C-4BCF-99F2-104066BCC3F9", + "refField": "88311B02-719F-45ED-9603-84EEA4F6F802", + "myRows": "n", + "refRows": "1", + "innerType": "" } ] }, @@ -5731,6 +5739,22 @@ "myRows": "n", "refRows": "1", "innerType": "" + }, + { + "myField": "3F567BD5-256D-4843-ADDF-0805BE706112", + "refEntity": "30E9507B-707C-4BCF-99F2-104066BCC3F9", + "refField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7", + "myRows": "n", + "refRows": "1", + "innerType": "" + }, + { + "myField": "3F567BD5-256D-4843-ADDF-0805BE706112", + "refEntity": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", + "refField": "93852E9B-AD50-40B6-A131-B62EFFE3438C", + "myRows": "n", + "refRows": "1", + "innerType": "" } ] }, @@ -7725,23 +7749,6 @@ "name": "manhattan" } }, - { - "id": "0096fe4e-1e80-427c-9549-8575d651101b", - "shape": "erdRelation", - "source": { - "cell": "6eba7e01-588a-4631-a8a3-9eb43b950339", - "port": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3%out" - }, - "target": { - "cell": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", - "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%in" - }, - "relation": "1:n", - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - } - }, { "id": "7507bd81-c9aa-4396-9915-767aad52d2c9", "shape": "erdRelation", @@ -7776,16 +7783,6 @@ "name": "manhattan" } }, - { - "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", - "shape": "table", - "position": { - "x": -461, - "y": 180 - }, - "count": 0, - "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" - }, { "id": "bc232bfc-31b6-45ad-aab1-265c17652b95", "shape": "erdRelation", @@ -7956,16 +7953,6 @@ "count": 0, "originKey": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2" }, - { - "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", - "shape": "table", - "position": { - "x": -505, - "y": 520 - }, - "count": 0, - "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" - }, { "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", "shape": "table", @@ -7997,14 +7984,77 @@ "originKey": "379D48BE-3522-413B-8FA3-752D65ADB597" }, { - "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "id": "653f38d3-e9ff-4fb9-b1c1-f88b6b751d9a", + "shape": "erdRelation", + "source": { + "cell": "6eba7e01-588a-4631-a8a3-9eb43b950339", + "port": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3%in" + }, + "target": { + "cell": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", + "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%in" + }, + "relation": "1:n", + "vertices": [ + { + "x": -20, + "y": 120 + } + ], + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, + { + "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c", "shape": "table", "position": { - "x": 30, - "y": 487 + "x": -450.5, + "y": -368 }, "count": 0, - "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" + "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213" + }, + { + "id": "ecef0fdf-c5f8-4347-bd26-010ccf106255", + "shape": "erdRelation", + "source": { + "cell": "fa539400-f09d-485c-af47-7055dd7beeaa", + "port": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7%out" + }, + "target": { + "cell": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "port": "3F567BD5-256D-4843-ADDF-0805BE706112%in" + }, + "relation": "1:n", + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, + { + "id": "e00146ac-7fc6-4c53-a0ad-83afe9380003", + "shape": "erdRelation", + "source": { + "cell": "fa539400-f09d-485c-af47-7055dd7beeaa", + "port": "88311B02-719F-45ED-9603-84EEA4F6F802%out" + }, + "target": { + "cell": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", + "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%in" + }, + "relation": "1:n", + "vertices": [ + { + "x": -20, + "y": 320 + } + ], + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } }, { "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", @@ -8016,6 +8066,49 @@ "count": 0, "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" }, + { + "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", + "shape": "table", + "position": { + "x": 30, + "y": -302 + }, + "count": 0, + "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" + }, + { + "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", + "shape": "table", + "position": { + "x": -461, + "y": 180 + }, + "count": 0, + "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" + }, + { + "id": "28d4a60a-591b-40e2-805d-a3d95071da04", + "shape": "erdRelation", + "source": { + "cell": "33dd1974-86a6-4344-9c56-ed081a79fa7f", + "port": "93852E9B-AD50-40B6-A131-B62EFFE3438C%out" + }, + "target": { + "cell": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "port": "3F567BD5-256D-4843-ADDF-0805BE706112%in" + }, + "relation": "1:n", + "vertices": [ + { + "x": -40, + "y": 688 + } + ], + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, { "id": "33dd1974-86a6-4344-9c56-ed081a79fa7f", "shape": "table", @@ -8027,24 +8120,24 @@ "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" }, { - "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c", + "id": "fa539400-f09d-485c-af47-7055dd7beeaa", "shape": "table", "position": { - "x": 118, - "y": -167 + "x": -560, + "y": 527 }, "count": 0, - "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213" + "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9" }, { - "id": "fa539400-f09d-485c-af47-7055dd7beeaa", + "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", "shape": "table", "position": { - "x": -570.5, - "y": -694 + "x": 30, + "y": 487 }, "count": 0, - "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9" + "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" } ] }, diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2022103140547.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2022107165016.pdma.json similarity index 97% rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2022103140547.pdma.json rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2022107165016.pdma.json index 65222e1a..c37ee1fa 100644 --- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2022103140547.pdma.json +++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2022107165016.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.1.3", "createdTime": "2022-10-3 12:39:39", - "updatedTime": "2022-10-3 14:00:08", + "updatedTime": "2022-10-7 16:50:15", "dbConns": [], "profile": { "default": { @@ -1341,7 +1341,7 @@ "notNull": true, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "88311B02-719F-45ED-9603-84EEA4F6F802", "extProps": {} @@ -1358,7 +1358,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "F38B8E9C-1AEE-421F-A7FF-AE124B8A411D", "extProps": {} @@ -1392,7 +1392,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "B5836504-AEBF-4837-A5B3-27F8B2D84577", "extProps": {} @@ -1409,7 +1409,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "2AF9499E-33C7-4254-BAB5-7E762F45384C", "extProps": {} @@ -1426,7 +1426,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "C6EB2532-EF98-4E10-912A-24E84A3BBAF8", "extProps": {} @@ -1443,7 +1443,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "53A55057-9285-47A9-A643-1D2EC8E9CF9A", "extProps": {} @@ -1460,7 +1460,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "17EF80CF-F695-4AEA-A834-43E7FA925E26", "extProps": {} @@ -2237,6 +2237,14 @@ "myRows": "n", "refRows": "1", "innerType": "" + }, + { + "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "refEntity": "30E9507B-707C-4BCF-99F2-104066BCC3F9", + "refField": "88311B02-719F-45ED-9603-84EEA4F6F802", + "myRows": "n", + "refRows": "1", + "innerType": "" } ] }, @@ -5731,6 +5739,22 @@ "myRows": "n", "refRows": "1", "innerType": "" + }, + { + "myField": "3F567BD5-256D-4843-ADDF-0805BE706112", + "refEntity": "30E9507B-707C-4BCF-99F2-104066BCC3F9", + "refField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7", + "myRows": "n", + "refRows": "1", + "innerType": "" + }, + { + "myField": "3F567BD5-256D-4843-ADDF-0805BE706112", + "refEntity": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", + "refField": "93852E9B-AD50-40B6-A131-B62EFFE3438C", + "myRows": "n", + "refRows": "1", + "innerType": "" } ] }, @@ -6056,7 +6080,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF", + "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", + "refField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E", + "myRows": "n", + "refRows": "1", + "innerType": "" + } + ] }, { "id": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", @@ -6303,7 +6336,24 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", + "refEntity": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", + "refField": "98F8F005-A630-4C98-8C1F-ECCA64E65996", + "myRows": "n", + "refRows": "1", + "innerType": "" + }, + { + "myField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", + "refEntity": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", + "refField": "61C58DEB-2779-451F-82AD-3B03BC9C795D", + "myRows": "n", + "refRows": "1", + "innerType": "" + } + ] }, { "id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", @@ -6516,7 +6566,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "41BFEC37-8F13-42D0-B8ED-123071447D18", + "refEntity": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", + "refField": "4C09B365-4B2A-4613-9133-DF0421BFC85C", + "myRows": "n", + "refRows": "1", + "innerType": "" + } + ] }, { "id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", @@ -7559,6 +7618,12 @@ "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%out" }, "relation": "1:n", + "vertices": [ + { + "x": 520, + "y": 0 + } + ], "fillColor": "#ACDAFC", "router": { "name": "manhattan" @@ -7576,6 +7641,12 @@ "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%out" }, "relation": "1:n", + "vertices": [ + { + "x": 510, + "y": 120 + } + ], "fillColor": "#ACDAFC", "router": { "name": "manhattan" @@ -7627,6 +7698,12 @@ "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%in" }, "relation": "1:n", + "vertices": [ + { + "x": -10, + "y": 140 + } + ], "fillColor": "#ACDAFC", "router": { "name": "manhattan" @@ -7644,6 +7721,12 @@ "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%out" }, "relation": "1:n", + "vertices": [ + { + "x": 520, + "y": 260 + } + ], "fillColor": "#ACDAFC", "router": { "name": "manhattan" @@ -7667,15 +7750,15 @@ } }, { - "id": "0096fe4e-1e80-427c-9549-8575d651101b", + "id": "7507bd81-c9aa-4396-9915-767aad52d2c9", "shape": "erdRelation", "source": { - "cell": "6eba7e01-588a-4631-a8a3-9eb43b950339", - "port": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3%out" + "cell": "da49dd57-b256-4f89-9653-8f35edef5a02", + "port": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE%in" }, "target": { - "cell": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", - "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%in" + "cell": "e417b0e0-85e2-4073-977c-60fe6a7479ae", + "port": "0EE3108C-0995-4D82-AA03-FF63F0D62626%in" }, "relation": "1:n", "fillColor": "#ACDAFC", @@ -7684,15 +7767,15 @@ } }, { - "id": "7507bd81-c9aa-4396-9915-767aad52d2c9", + "id": "f25165ac-bb9e-441b-8649-9256e7274726", "shape": "erdRelation", "source": { - "cell": "da49dd57-b256-4f89-9653-8f35edef5a02", - "port": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE%in" + "cell": "33dd1974-86a6-4344-9c56-ed081a79fa7f", + "port": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9%in" }, "target": { - "cell": "e417b0e0-85e2-4073-977c-60fe6a7479ae", - "port": "0EE3108C-0995-4D82-AA03-FF63F0D62626%in" + "cell": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", + "port": "1012CEB5-702E-428F-ABEF-17BD9856E4E3%out" }, "relation": "1:n", "fillColor": "#ACDAFC", @@ -7701,15 +7784,15 @@ } }, { - "id": "f25165ac-bb9e-441b-8649-9256e7274726", + "id": "bc232bfc-31b6-45ad-aab1-265c17652b95", "shape": "erdRelation", "source": { - "cell": "33dd1974-86a6-4344-9c56-ed081a79fa7f", - "port": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9%in" + "cell": "c59993ba-6d74-4c9d-9340-a2a882ca2cea", + "port": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E%in" }, "target": { - "cell": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", - "port": "1012CEB5-702E-428F-ABEF-17BD9856E4E3%out" + "cell": "f16da34e-971e-49b6-b69c-db827c1fef59", + "port": "6F03B0D9-DECD-45A0-B0F5-1921289472EF%in" }, "relation": "1:n", "fillColor": "#ACDAFC", @@ -7718,14 +7801,77 @@ } }, { - "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", + "id": "d9d4162e-7ca7-4f67-b5e1-a0f2e4baa7de", + "shape": "erdRelation", + "source": { + "cell": "6fb8d8fb-7123-4c14-bb4a-a3cd11272a41", + "port": "98F8F005-A630-4C98-8C1F-ECCA64E65996%in" + }, + "target": { + "cell": "c59993ba-6d74-4c9d-9340-a2a882ca2cea", + "port": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF%in" + }, + "relation": "1:n", + "vertices": [ + { + "x": 1390, + "y": 241 + } + ], + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, + { + "id": "363d51ce-9dba-4c49-aa13-2c6c7284c71a", + "shape": "erdRelation", + "source": { + "cell": "2be3d363-8b94-4f0b-a4b4-f38b9039240a", + "port": "61C58DEB-2779-451F-82AD-3B03BC9C795D%in" + }, + "target": { + "cell": "c59993ba-6d74-4c9d-9340-a2a882ca2cea", + "port": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF%in" + }, + "relation": "1:n", + "vertices": [ + { + "x": 1360, + "y": 270 + } + ], + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, + { + "id": "11207adc-a74c-42cc-ae45-8ac628dce957", + "shape": "erdRelation", + "source": { + "cell": "2be3d363-8b94-4f0b-a4b4-f38b9039240a", + "port": "4C09B365-4B2A-4613-9133-DF0421BFC85C%in" + }, + "target": { + "cell": "6fb8d8fb-7123-4c14-bb4a-a3cd11272a41", + "port": "41BFEC37-8F13-42D0-B8ED-123071447D18%in" + }, + "relation": "1:n", + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, + { + "id": "ddf927a6-e081-4c05-937d-bc64f59fc32a", "shape": "table", "position": { - "x": -505, - "y": 520 + "x": 1220, + "y": -523 }, "count": 0, - "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" + "originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E" }, { "id": "3de2bd13-2384-4816-85e5-dcf4240a6cb7", @@ -7738,54 +7884,84 @@ "originKey": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1" }, { - "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5", "shape": "table", "position": { - "x": 30, - "y": 487 + "x": 560, + "y": 140 }, "count": 0, - "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" + "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E" }, { - "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", + "id": "da49dd57-b256-4f89-9653-8f35edef5a02", "shape": "table", "position": { - "x": 30, - "y": 80 + "x": 1220, + "y": -805 }, "count": 0, - "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" + "originKey": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9" }, { - "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", + "id": "e417b0e0-85e2-4073-977c-60fe6a7479ae", "shape": "table", "position": { - "x": -461, - "y": 180 + "x": 1220, + "y": -1057 }, "count": 0, - "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" + "originKey": "6036D7E4-7ECB-4888-9D74-58DA414447F8" }, { - "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", + "id": "c59993ba-6d74-4c9d-9340-a2a882ca2cea", "shape": "table", "position": { - "x": -1054, - "y": -190 + "x": 1430, + "y": 201 }, "count": 0, - "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" + "originKey": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32" }, { - "id": "33dd1974-86a6-4344-9c56-ed081a79fa7f", + "id": "f16da34e-971e-49b6-b69c-db827c1fef59", "shape": "table", "position": { - "x": -560, + "x": 1430, + "y": 71 + }, + "count": 0, + "originKey": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE" + }, + { + "id": "6fb8d8fb-7123-4c14-bb4a-a3cd11272a41", + "shape": "table", + "position": { + "x": 1430, + "y": 470 + }, + "count": 0, + "originKey": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A" + }, + { + "id": "2be3d363-8b94-4f0b-a4b4-f38b9039240a", + "shape": "table", + "position": { + "x": 1430, + "y": 695 + }, + "count": 0, + "originKey": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2" + }, + { + "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", + "shape": "table", + "position": { + "x": -1054, "y": -190 }, "count": 0, - "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" + "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" }, { "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431", @@ -7808,54 +7984,160 @@ "originKey": "379D48BE-3522-413B-8FA3-752D65ADB597" }, { - "id": "e417b0e0-85e2-4073-977c-60fe6a7479ae", + "id": "653f38d3-e9ff-4fb9-b1c1-f88b6b751d9a", + "shape": "erdRelation", + "source": { + "cell": "6eba7e01-588a-4631-a8a3-9eb43b950339", + "port": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3%in" + }, + "target": { + "cell": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", + "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%in" + }, + "relation": "1:n", + "vertices": [ + { + "x": -20, + "y": 120 + } + ], + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, + { + "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c", "shape": "table", "position": { - "x": 1220, - "y": -1057 + "x": -450.5, + "y": -368 }, "count": 0, - "originKey": "6036D7E4-7ECB-4888-9D74-58DA414447F8" + "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213" }, { - "id": "da49dd57-b256-4f89-9653-8f35edef5a02", + "id": "ecef0fdf-c5f8-4347-bd26-010ccf106255", + "shape": "erdRelation", + "source": { + "cell": "fa539400-f09d-485c-af47-7055dd7beeaa", + "port": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7%out" + }, + "target": { + "cell": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "port": "3F567BD5-256D-4843-ADDF-0805BE706112%in" + }, + "relation": "1:n", + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, + { + "id": "e00146ac-7fc6-4c53-a0ad-83afe9380003", + "shape": "erdRelation", + "source": { + "cell": "fa539400-f09d-485c-af47-7055dd7beeaa", + "port": "88311B02-719F-45ED-9603-84EEA4F6F802%out" + }, + "target": { + "cell": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", + "port": "198D443B-59EF-4F60-AA16-7F7CCBA63E76%in" + }, + "relation": "1:n", + "vertices": [ + { + "x": -20, + "y": 320 + } + ], + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, + { + "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", "shape": "table", "position": { - "x": 1220, - "y": -805 + "x": 30, + "y": 80 }, "count": 0, - "originKey": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9" + "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" }, { - "id": "f16da34e-971e-49b6-b69c-db827c1fef59", + "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", "shape": "table", "position": { - "x": 1430, - "y": 80 + "x": 30, + "y": -302 }, "count": 0, - "originKey": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE" + "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" }, { - "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5", + "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", "shape": "table", "position": { - "x": 560, - "y": 140 + "x": -461, + "y": 180 }, "count": 0, - "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E" + "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" }, { - "id": "c59993ba-6d74-4c9d-9340-a2a882ca2cea", + "id": "28d4a60a-591b-40e2-805d-a3d95071da04", + "shape": "erdRelation", + "source": { + "cell": "33dd1974-86a6-4344-9c56-ed081a79fa7f", + "port": "93852E9B-AD50-40B6-A131-B62EFFE3438C%out" + }, + "target": { + "cell": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "port": "3F567BD5-256D-4843-ADDF-0805BE706112%in" + }, + "relation": "1:n", + "vertices": [ + { + "x": -40, + "y": 688 + } + ], + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + } + }, + { + "id": "33dd1974-86a6-4344-9c56-ed081a79fa7f", "shape": "table", "position": { - "x": 1430, - "y": 201 + "x": -560, + "y": -190 }, "count": 0, - "originKey": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32" + "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" + }, + { + "id": "fa539400-f09d-485c-af47-7055dd7beeaa", + "shape": "table", + "position": { + "x": -560, + "y": 527 + }, + "count": 0, + "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9" + }, + { + "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "shape": "table", + "position": { + "x": 30, + "y": 487 + }, + "count": 0, + "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" } ] }, diff --git a/doc/步步为盈数据库.pdma.json b/doc/步步为盈数据库.pdma.json index 13073cd0..6de3e9de 100644 --- a/doc/步步为盈数据库.pdma.json +++ b/doc/步步为盈数据库.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.1.3", "createdTime": "2022-10-3 12:39:39", - "updatedTime": "2022-10-3 14:08:05", + "updatedTime": "2022-10-7 16:50:16", "dbConns": [], "profile": { "default": {