From ec16b3dd8d24285976c3857d87ccbabd08093aaa Mon Sep 17 00:00:00 2001 From: xijue Date: Thu, 28 Aug 2025 11:49:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=AE=80=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/db/mms.pdma.json | 920 ++++++++++++++++++++++------------------ 1 file changed, 497 insertions(+), 423 deletions(-) diff --git a/script/db/mms.pdma.json b/script/db/mms.pdma.json index b81c1da..65bdb41 100644 --- a/script/db/mms.pdma.json +++ b/script/db/mms.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.9.4", "createdTime": "2023-1-5 23:34:04", - "updatedTime": "2025-6-24 15:08:16", + "updatedTime": "2025-8-28 11:35:47", "dbConns": [], "profile": { "default": { @@ -4611,6 +4611,164 @@ "attr9": "", "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE" }, + { + "defKey": "redirect_path", + "defName": "重定向路由", + "comment": "", + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "type": "VARCHAR", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "attr1": "", + "attr2": "", + "attr3": "", + "attr4": "", + "attr5": "", + "attr6": "", + "attr7": "", + "attr8": "", + "attr9": "", + "id": "7A762FFC-62EB-4334-AB31-65A64CDD1579", + "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", + "extProps": {}, + "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE" + }, + { + "defKey": "language_code", + "defName": "i18n编码", + "comment": "", + "domain": "", + "type": "VARCHAR", + "len": 300, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "attr1": "", + "attr2": "", + "attr3": "", + "attr4": "", + "attr5": "", + "attr6": "", + "attr7": "", + "attr8": "", + "attr9": "", + "id": "C59B6CD4-D51A-4A50-9488-26E39413E925", + "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", + "extProps": {}, + "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE" + }, + { + "defKey": "is_fast", + "defName": "是否快捷菜单", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "0", + "hideInGraph": false, + "refDict": "", + "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "32290380-AD16-4B7E-96BA-5A79DADC42BE" + }, + { + "defKey": "is_iframe", + "defName": "是否内嵌", + "comment": "", + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "type": "INT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "-1", + "hideInGraph": false, + "refDict": "", + "attr1": "", + "attr2": "", + "attr3": "", + "attr4": "", + "attr5": "", + "attr6": "", + "attr7": "", + "attr8": "", + "attr9": "", + "id": "F0D66C29-86EA-4BCB-B9F3-C281CCF676E2", + "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811", + "extProps": {}, + "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE" + }, + { + "defKey": "is_open_link", + "defName": "是否外链", + "comment": "", + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "type": "INT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "-1", + "hideInGraph": false, + "refDict": "", + "attr1": "", + "attr2": "", + "attr3": "", + "attr4": "", + "attr5": "", + "attr6": "", + "attr7": "", + "attr8": "", + "attr9": "", + "id": "E7B5FD0D-9FFD-40A9-8225-5B287292928D", + "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811", + "extProps": {}, + "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE" + }, + { + "defKey": "is_link", + "defName": "外链path/内嵌url", + "comment": "", + "domain": "", + "type": "VARCHAR", + "len": 500, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "attr1": "", + "attr2": "", + "attr3": "", + "attr4": "", + "attr5": "", + "attr6": "", + "attr7": "", + "attr8": "", + "attr9": "", + "id": "CAB49A09-C798-440A-94D9-EAFBD821C321", + "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", + "extProps": {}, + "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE" + }, { "defKey": "always_show", "defName": "是否总是显示", @@ -4834,152 +4992,13 @@ "attr8": "", "attr9": "", "extProps": {} - }, - { - "defKey": "redirect_path", - "defName": "重定向路由", - "comment": "", - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "type": "VARCHAR", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "7A762FFC-62EB-4334-AB31-65A64CDD1579", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE" - }, - { - "defKey": "language_code", - "defName": "i18n编码", - "comment": "", - "domain": "", - "type": "VARCHAR", - "len": 300, - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "C59B6CD4-D51A-4A50-9488-26E39413E925", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE" - }, - { - "defKey": "is_iframe", - "defName": "是否内嵌", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "INT", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "-1", - "hideInGraph": false, - "refDict": "", - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "F0D66C29-86EA-4BCB-B9F3-C281CCF676E2", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811", - "extProps": {}, - "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE" - }, - { - "defKey": "is_open_link", - "defName": "是否外链", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "INT", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "-1", - "hideInGraph": false, - "refDict": "", - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "E7B5FD0D-9FFD-40A9-8225-5B287292928D", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811", - "extProps": {}, - "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE" - }, - { - "defKey": "is_link", - "defName": "外链path/内嵌url", - "comment": "", - "domain": "", - "type": "VARCHAR", - "len": 500, - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "CAB49A09-C798-440A-94D9-EAFBD821C321", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE" } ], "correlations": [], "indexes": [], "type": "P", - "sysProps": {} + "sysProps": {}, + "notes": {} }, { "id": "252D8986-CFC6-4F9A-9E1E-C8189A10211B", @@ -17957,7 +17976,16 @@ "type": "P", "defName": "广告", "notes": {}, - "correlations": [], + "correlations": [ + { + "myField": "22860669-7A09-4875-8F1F-7EE3B1E39A7C", + "refEntity": "1C4270A5-9DC1-4C3D-B5ED-FB549809289F", + "refField": "788C0D61-081A-4F38-87FA-C65FA52DC7AA", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "sysProps": {} }, { @@ -19472,7 +19500,7 @@ }, { "defKey": "store_type", - "defName": "店铺类型", + "defName": "店铺性质", "comment": "1:企业 2:个人", "type": "", "len": "", @@ -20041,7 +20069,16 @@ "defName": "店铺", "indexes": [], "notes": {}, - "correlations": [], + "correlations": [ + { + "myField": "649D93C7-26EA-4161-9085-2346BCB96895", + "refEntity": "E1FACCFF-0040-4F4C-B130-E6B472991198", + "refField": "7A77915B-DF91-4930-A785-FF5BF40AE0F2", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "sysProps": {} }, { @@ -27301,7 +27338,16 @@ "type": "P", "defName": "会员认证", "notes": {}, - "correlations": [] + "correlations": [ + { + "myField": "C54CD40B-5760-4431-AF04-302A8535F7AB", + "refEntity": "99A289AA-C2BB-4F7B-B4FA-5F975A246269", + "refField": "B20F71F4-A4D6-4841-BD8D-CC7711CF7206", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "7023E66C-6118-440F-A59F-D3E1198D3C6A", @@ -27787,7 +27833,16 @@ "type": "P", "defName": "会员收货地址", "notes": {}, - "correlations": [] + "correlations": [ + { + "myField": "BC97D45C-A302-4D1C-B3CF-AE35348866B4", + "refEntity": "99A289AA-C2BB-4F7B-B4FA-5F975A246269", + "refField": "B20F71F4-A4D6-4841-BD8D-CC7711CF7206", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "D8F9DE2F-D153-4D42-9482-C0D47148DA29", @@ -31405,16 +31460,7 @@ "type": "P", "defName": "网站文章", "notes": {}, - "correlations": [ - { - "myField": "7AB32D12-5FFF-43E1-80CE-F7EF4CE21C20", - "refEntity": "920A8E89-75C6-4A98-BD3F-89EAE67C4362", - "refField": "72439DB5-82DC-45C7-8613-FAC7F932E703", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "8EB63405-9A3D-4448-8A07-DE656EA815E4", @@ -32278,16 +32324,7 @@ "type": "P", "defName": "网站广告", "notes": {}, - "correlations": [ - { - "myField": "966DC2A8-7076-4DDA-B15E-FD8F098DFCAC", - "refEntity": "8EB63405-9A3D-4448-8A07-DE656EA815E4", - "refField": "BE493953-B186-4944-BA2D-BB6C6E3503C8", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "CFAB2617-0FCC-4852-A8E7-33CD8D456F35", @@ -33335,6 +33372,215 @@ "height": 399 } }, + { + "id": "2c20c76a-6d67-4cdc-8141-8d5401ca7162", + "shape": "table", + "position": { + "x": -420, + "y": -190 + }, + "count": 0, + "originKey": "ABE4FCDE-DCB3-46FD-97BE-BB60F3815304", + "fillColor": "rgb(249, 186, 80)", + "size": { + "width": 370, + "height": 261 + } + }, + { + "id": "4ed64ea5-c0b5-4341-9aa6-07f2033913c7", + "shape": "table", + "position": { + "x": 559.9999999999993, + "y": -189.99999999999923 + }, + "count": 0, + "originKey": "BFE0590E-ABBD-488B-A987-58D0496F1D15", + "fillColor": "rgb(249, 186, 80)", + "size": { + "width": 370, + "height": 290 + } + }, + { + "id": "87edff33-571b-495f-8126-e62a3c794b4f", + "shape": "table", + "position": { + "x": 1043, + "y": 120 + }, + "count": 0, + "originKey": "D9B027AC-CDCB-4A4B-A6AA-06281E8D0D74", + "size": { + "width": 370, + "height": 307 + } + }, + { + "id": "cd6025ad-92c8-41d5-8fc2-c96a6a3dd2e8", + "shape": "table", + "position": { + "x": 59.99999999999932, + "y": 120.00000000000074 + }, + "count": 0, + "originKey": "B4A49451-7222-44FF-B8BE-A2106E17A7E8", + "fillColor": "rgb(214, 74, 67)", + "size": { + "width": 400, + "height": 400 + } + }, + { + "id": "ea1bfe60-06e7-4ea4-9806-2cdfd2243e99", + "shape": "table", + "position": { + "x": -2471, + "y": -190 + }, + "count": 0, + "originKey": "09ED4AD6-7277-4C33-B1DF-2CEAF99CE6D9", + "fillColor": "rgb(249, 186, 80)", + "size": { + "width": 406, + "height": 261 + } + }, + { + "id": "2d9b2212-c045-4a0a-93df-de2dbc7831d4", + "shape": "table", + "position": { + "x": -2480, + "y": -800 + }, + "count": 0, + "originKey": "0C9EC6BC-509E-4B0A-ABF9-4B8DA071CE2A", + "fillColor": "rgb(247, 151, 128)", + "size": { + "width": 364, + "height": 307 + } + }, + { + "id": "ed7e2304-124a-4543-87de-2b47a30e3c8f", + "shape": "table", + "position": { + "x": -2986.5, + "y": 630 + }, + "count": 0, + "originKey": "415D3D7F-566D-4C16-AECC-F51586EECB9E", + "fillColor": "#fc80eb", + "size": { + "width": 370, + "height": 284 + } + }, + { + "id": "c7c84fa6-f865-405e-96cf-891901511b9e", + "shape": "table", + "position": { + "x": -2471, + "y": 630 + }, + "count": 0, + "originKey": "ACBF0CDB-6D8F-4EA4-8715-F193DE655C3D", + "fillColor": "#bb19a4", + "size": { + "width": 370, + "height": 290 + } + }, + { + "id": "e0f93064-1a16-45cc-976f-5045684f8bb8", + "shape": "table", + "position": { + "x": -3076, + "y": -800 + }, + "count": 0, + "originKey": "4A6F1C38-CA08-475D-A6BE-89A8735FC8E8", + "type": "P", + "size": { + "width": 430, + "height": 238 + } + }, + { + "id": "2a0e50c0-1533-47fb-9d28-c7546bbf1a48", + "shape": "table", + "position": { + "x": -1937, + "y": -800 + }, + "count": 0, + "originKey": "2CFCBED0-DAF1-442E-A2CE-15554ACE8D21", + "type": "P", + "size": { + "width": 398, + "height": 307 + } + }, + { + "id": "9b3d4eed-378d-4a4f-9785-7535a4fe8e39", + "shape": "table", + "position": { + "x": -1358, + "y": -800 + }, + "count": 0, + "originKey": "95C17F03-D2C3-47E1-9CD1-EF26410A1FCB", + "type": "P", + "size": { + "width": 420, + "height": 300 + } + }, + { + "id": "7c9e374f-6301-43e1-b682-bd3a15453096", + "shape": "table", + "position": { + "x": -790, + "y": -800 + }, + "count": 0, + "originKey": "252D8986-CFC6-4F9A-9E1E-C8189A10211B", + "fillColor": "rgb(154, 72, 199)", + "size": { + "width": 370, + "height": 307 + } + }, + { + "id": "9006e469-c7ec-4a02-8490-fa91ca885144", + "shape": "table", + "position": { + "x": -1456, + "y": -190 + }, + "count": 0, + "originKey": "AF982AE1-4589-4004-9C90-53166EFE4E88", + "fillColor": "rgb(249, 186, 80)", + "size": { + "width": 370, + "height": 261 + } + }, + { + "id": "544f84cd-d373-4d80-a581-cf2b03ce50f3", + "shape": "table", + "position": { + "x": -296, + "y": -800 + }, + "count": 0, + "originKey": "43FB37AC-9F6A-47B3-A009-1420362A8C5A", + "type": "P", + "size": { + "width": 430, + "height": 238 + } + }, { "id": "6fe6a7d3-ba72-4cd8-8358-4fe727a94fa6", "shape": "erdRelation", @@ -33496,110 +33742,6 @@ } } }, - { - "id": "2c20c76a-6d67-4cdc-8141-8d5401ca7162", - "shape": "table", - "position": { - "x": -420, - "y": -190 - }, - "count": 0, - "originKey": "ABE4FCDE-DCB3-46FD-97BE-BB60F3815304", - "fillColor": "rgb(249, 186, 80)", - "size": { - "width": 370, - "height": 261 - } - }, - { - "id": "4ed64ea5-c0b5-4341-9aa6-07f2033913c7", - "shape": "table", - "position": { - "x": 559.9999999999993, - "y": -189.99999999999923 - }, - "count": 0, - "originKey": "BFE0590E-ABBD-488B-A987-58D0496F1D15", - "fillColor": "rgb(249, 186, 80)", - "size": { - "width": 370, - "height": 290 - } - }, - { - "id": "87edff33-571b-495f-8126-e62a3c794b4f", - "shape": "table", - "position": { - "x": 1043, - "y": 120 - }, - "count": 0, - "originKey": "D9B027AC-CDCB-4A4B-A6AA-06281E8D0D74", - "size": { - "width": 370, - "height": 307 - } - }, - { - "id": "cd6025ad-92c8-41d5-8fc2-c96a6a3dd2e8", - "shape": "table", - "position": { - "x": 59.99999999999932, - "y": 120.00000000000074 - }, - "count": 0, - "originKey": "B4A49451-7222-44FF-B8BE-A2106E17A7E8", - "fillColor": "rgb(214, 74, 67)", - "size": { - "width": 400, - "height": 400 - } - }, - { - "id": "ea1bfe60-06e7-4ea4-9806-2cdfd2243e99", - "shape": "table", - "position": { - "x": -2471, - "y": -190 - }, - "count": 0, - "originKey": "09ED4AD6-7277-4C33-B1DF-2CEAF99CE6D9", - "fillColor": "rgb(249, 186, 80)", - "size": { - "width": 406, - "height": 261 - } - }, - { - "id": "2d9b2212-c045-4a0a-93df-de2dbc7831d4", - "shape": "table", - "position": { - "x": -2480, - "y": -800 - }, - "count": 0, - "originKey": "0C9EC6BC-509E-4B0A-ABF9-4B8DA071CE2A", - "fillColor": "rgb(247, 151, 128)", - "size": { - "width": 364, - "height": 307 - } - }, - { - "id": "ed7e2304-124a-4543-87de-2b47a30e3c8f", - "shape": "table", - "position": { - "x": -2986.5, - "y": 630 - }, - "count": 0, - "originKey": "415D3D7F-566D-4C16-AECC-F51586EECB9E", - "fillColor": "#fc80eb", - "size": { - "width": 370, - "height": 284 - } - }, { "id": "a5807650-9349-42fd-8808-d775097dbe43", "shape": "table", @@ -33616,66 +33758,6 @@ "height": 410 } }, - { - "id": "c7c84fa6-f865-405e-96cf-891901511b9e", - "shape": "table", - "position": { - "x": -2471, - "y": 630 - }, - "count": 0, - "originKey": "ACBF0CDB-6D8F-4EA4-8715-F193DE655C3D", - "fillColor": "#bb19a4", - "size": { - "width": 370, - "height": 290 - } - }, - { - "id": "e0f93064-1a16-45cc-976f-5045684f8bb8", - "shape": "table", - "position": { - "x": -3076, - "y": -800 - }, - "count": 0, - "originKey": "4A6F1C38-CA08-475D-A6BE-89A8735FC8E8", - "type": "P", - "size": { - "width": 430, - "height": 238 - } - }, - { - "id": "2a0e50c0-1533-47fb-9d28-c7546bbf1a48", - "shape": "table", - "position": { - "x": -1937, - "y": -800 - }, - "count": 0, - "originKey": "2CFCBED0-DAF1-442E-A2CE-15554ACE8D21", - "type": "P", - "size": { - "width": 398, - "height": 307 - } - }, - { - "id": "9b3d4eed-378d-4a4f-9785-7535a4fe8e39", - "shape": "table", - "position": { - "x": -1358, - "y": -800 - }, - "count": 0, - "originKey": "95C17F03-D2C3-47E1-9CD1-EF26410A1FCB", - "type": "P", - "size": { - "width": 420, - "height": 300 - } - }, { "id": "bb81d81a-f50a-4694-b328-074318865758", "shape": "table", @@ -33690,51 +33772,6 @@ "width": 457, "height": 376 } - }, - { - "id": "7c9e374f-6301-43e1-b682-bd3a15453096", - "shape": "table", - "position": { - "x": -790, - "y": -800 - }, - "count": 0, - "originKey": "252D8986-CFC6-4F9A-9E1E-C8189A10211B", - "fillColor": "rgb(154, 72, 199)", - "size": { - "width": 370, - "height": 307 - } - }, - { - "id": "9006e469-c7ec-4a02-8490-fa91ca885144", - "shape": "table", - "position": { - "x": -1456, - "y": -190 - }, - "count": 0, - "originKey": "AF982AE1-4589-4004-9C90-53166EFE4E88", - "fillColor": "rgb(249, 186, 80)", - "size": { - "width": 370, - "height": 261 - } - }, - { - "id": "544f84cd-d373-4d80-a581-cf2b03ce50f3", - "shape": "table", - "position": { - "x": -296, - "y": -800 - }, - "count": 0, - "originKey": "43FB37AC-9F6A-47B3-A009-1420362A8C5A", - "type": "P", - "size": { - "width": 430, - "height": 238 - } } ] }, @@ -33747,6 +33784,37 @@ "relationType": "field", "canvasData": { "cells": [ + { + "id": "9342cfb1-3fcc-4f91-b407-52f06361b985", + "shape": "table", + "position": { + "x": -130.00000000000068, + "y": 36 + }, + "count": 0, + "originKey": "7023E66C-6118-440F-A59F-D3E1198D3C6A", + "type": "P", + "size": { + "width": 430, + "height": 238 + } + }, + { + "id": "efa8d7a3-8196-4e08-ae23-b83bd50c0d18", + "shape": "table", + "position": { + "x": -130.00000000000068, + "y": -280 + }, + "count": 0, + "originKey": "C6625631-7232-49D2-B900-4DD085F3E05C", + "fillColor": "rgb(90, 213, 198)", + "type": "P", + "size": { + "width": 430, + "height": 238 + } + }, { "id": "74bc2353-86be-454c-8f98-be9822a8cc54", "shape": "erdRelation", @@ -33819,22 +33887,6 @@ "height": 330 } }, - { - "id": "34db1608-e5b0-4235-bc06-cb54e21677a7", - "shape": "table", - "position": { - "x": -820, - "y": -699.9999999999975 - }, - "count": 0, - "originKey": "01397545-9811-4B87-AE3D-937A143AA6A0", - "fillColor": "rgb(245, 220, 78)", - "type": "P", - "size": { - "width": 530, - "height": 300 - } - }, { "id": "89b89c1f-e6d8-4a98-a9bc-2264a149e029", "shape": "table", @@ -33849,37 +33901,6 @@ "height": 290 } }, - { - "id": "9342cfb1-3fcc-4f91-b407-52f06361b985", - "shape": "table", - "position": { - "x": -130.00000000000068, - "y": 36 - }, - "count": 0, - "originKey": "7023E66C-6118-440F-A59F-D3E1198D3C6A", - "type": "P", - "size": { - "width": 430, - "height": 238 - } - }, - { - "id": "efa8d7a3-8196-4e08-ae23-b83bd50c0d18", - "shape": "table", - "position": { - "x": -130.00000000000068, - "y": -280 - }, - "count": 0, - "originKey": "C6625631-7232-49D2-B900-4DD085F3E05C", - "fillColor": "rgb(90, 213, 198)", - "type": "P", - "size": { - "width": 430, - "height": 238 - } - }, { "id": "1dc0e8d3-2fc6-4280-a900-7579054ff85c", "shape": "table", @@ -33894,6 +33915,59 @@ "width": 430, "height": 290 } + }, + { + "id": "856f5c2b-e4f9-41ae-a354-d5127f91f805", + "shape": "erdRelation", + "source": { + "cell": "34db1608-e5b0-4235-bc06-cb54e21677a7", + "port": "649D93C7-26EA-4161-9085-2346BCB96895%in" + }, + "target": { + "cell": "eaea197d-8030-4d92-8593-3308076aa8cb", + "port": "7A77915B-DF91-4930-A785-FF5BF40AE0F2%out" + }, + "relation": "1:n", + "fillColor": "rgb(245, 220, 78)", + "router": { + "name": "manhattan" + }, + "attrs": { + "line": { + "strokeDasharray": "" + } + } + }, + { + "id": "eaea197d-8030-4d92-8593-3308076aa8cb", + "shape": "table", + "position": { + "x": -1375, + "y": -700 + }, + "count": 0, + "originKey": "E1FACCFF-0040-4F4C-B130-E6B472991198", + "type": "P", + "size": { + "width": 413, + "height": 330 + } + }, + { + "id": "34db1608-e5b0-4235-bc06-cb54e21677a7", + "shape": "table", + "position": { + "x": -820, + "y": -699.9999999999975 + }, + "count": 0, + "originKey": "01397545-9811-4B87-AE3D-937A143AA6A0", + "fillColor": "rgb(245, 220, 78)", + "type": "P", + "size": { + "width": 530, + "height": 300 + } } ] }, From eb1f00701eafd205737bfccc7a6d2543ed3c25ee Mon Sep 17 00:00:00 2001 From: xijue Date: Fri, 29 Aug 2025 16:20:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/db/mms.pdma.json | 519 ++++++++++++++++++++++++++-------------- 1 file changed, 342 insertions(+), 177 deletions(-) diff --git a/script/db/mms.pdma.json b/script/db/mms.pdma.json index 65bdb41..3c3e3b8 100644 --- a/script/db/mms.pdma.json +++ b/script/db/mms.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.9.4", "createdTime": "2023-1-5 23:34:04", - "updatedTime": "2025-8-28 11:35:47", + "updatedTime": "2025-8-29 16:20:29", "dbConns": [], "profile": { "default": { @@ -21,7 +21,7 @@ "primaryKey": false, "notNull": false, "autoIncrement": false, - "defaultValue": "0", + "defaultValue": "1", "hideInGraph": false, "refDict": "", "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811", @@ -2440,7 +2440,24 @@ "hideInGraph": true } ], - "correlations": [], + "correlations": [ + { + "myField": "397BE8C5-93D8-4322-B1F8-A1D4120B8B24", + "refEntity": "BFE0590E-ABBD-488B-A987-58D0496F1D15", + "refField": "D6F60405-3607-4D1C-A999-47C9846EC756", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "C50B8B56-C2E7-48D8-963D-5CE5B51E2597", + "refEntity": "D9B027AC-CDCB-4A4B-A6AA-06281E8D0D74", + "refField": "665A2119-5779-4B36-8177-E60C530CAA46", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "type": "P", "sysProps": {} }, @@ -3596,7 +3613,16 @@ "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE" } ], - "correlations": [], + "correlations": [ + { + "myField": "8D033263-BF89-4319-BBF7-144EC871B89D", + "refEntity": "415D3D7F-566D-4C16-AECC-F51586EECB9E", + "refField": "68CD00BC-65BC-4178-AAED-749B740559CB", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "indexes": [], "type": "P", "sysProps": {} @@ -4994,7 +5020,16 @@ "extProps": {} } ], - "correlations": [], + "correlations": [ + { + "myField": "ADC3FE83-EDF9-4827-AB89-A6B7921E6AD8", + "refEntity": "09ED4AD6-7277-4C33-B1DF-2CEAF99CE6D9", + "refField": "1E324D8A-A7BF-4D92-A756-7634599C7C8A", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "indexes": [], "type": "P", "sysProps": {}, @@ -6363,7 +6398,24 @@ "properties": {}, "serialId": null, "defName": "用户角色", - "correlations": [], + "correlations": [ + { + "myField": "D7B4E6C2-4E48-4C1C-977C-490B741C27CE", + "refEntity": "B4A49451-7222-44FF-B8BE-A2106E17A7E8", + "refField": "C6406A5A-FC70-4174-9572-A91FBA248AAE", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "85082C98-9598-4954-AAF6-E45B42E326D0", + "refEntity": "23FC8723-F709-4B95-B772-901B7D3393AB", + "refField": "C6D581CE-593F-4292-A713-D844153CCA72", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "indexes": [], "type": "P", "sysProps": {}, @@ -6781,7 +6833,24 @@ ], "properties": {}, "serialId": null, - "correlations": [], + "correlations": [ + { + "myField": "9676E817-A68C-41CD-B977-4DC30DA91480", + "refEntity": "23FC8723-F709-4B95-B772-901B7D3393AB", + "refField": "C6D581CE-593F-4292-A713-D844153CCA72", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "12153A00-27A7-4D94-B5AA-15D9AC833ACB", + "refEntity": "F5BDCFD4-2D15-4629-880E-3DA2DC907F95", + "refField": "ADC3FE83-EDF9-4827-AB89-A6B7921E6AD8", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "indexes": [], "defName": "角色功能", "type": "P", @@ -7387,7 +7456,16 @@ "properties": {}, "serialId": null, "defName": "系统租户", - "correlations": [], + "correlations": [ + { + "myField": "DD856E39-9E95-4877-911F-CE9C9F351F30", + "refEntity": "09ED4AD6-7277-4C33-B1DF-2CEAF99CE6D9", + "refField": "F46A94FF-38D3-4C39-A98B-0765EF610D0A", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "indexes": [], "type": "P", "sysProps": {}, @@ -7941,7 +8019,7 @@ "primaryKey": false, "notNull": false, "autoIncrement": false, - "defaultValue": "", + "defaultValue": "1", "hideInGraph": false, "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", "refDict": "", @@ -17402,7 +17480,7 @@ "primaryKey": false, "notNull": false, "autoIncrement": false, - "defaultValue": "0", + "defaultValue": "1", "hideInGraph": false, "refDict": "", "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811", @@ -17766,24 +17844,6 @@ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", "id": "47CCDA1D-5011-40CB-9AD1-DFEA11519B12" }, - { - "defKey": "image_url", - "defName": "图片地址", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "53DC11A7-15B6-4BF9-B790-C27BF951897E" - }, { "defKey": "route_parameter", "defName": "路由参数", @@ -17802,6 +17862,114 @@ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", "id": "45C763E4-86C7-49B7-A7F7-DA799C3663E0" }, + { + "defKey": "image_url", + "defName": "图片地址", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "53DC11A7-15B6-4BF9-B790-C27BF951897E" + }, + { + "defKey": "extended_parameter_one", + "defName": "扩展参数一", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "DE0957E1-FA63-4968-802C-329E6148495E" + }, + { + "defKey": "extended_parameter_two", + "defName": "扩展参数二", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "5AF80C8D-550D-4E02-8B08-FE22FA48543B" + }, + { + "defKey": "extended_parameter_three", + "defName": "扩展参数三", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "99445B24-73AA-4EFC-B605-FDC285AA6933" + }, + { + "defKey": "extended_parameter_four", + "defName": "扩展参数四", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "844529AC-1070-4388-BADB-2CDD734026A4" + }, + { + "defKey": "extended_parameter_five", + "defName": "扩展参数五", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "43F6B627-B219-4F75-A743-EFAD5B01FA83" + }, { "defKey": "status", "defName": "状态", @@ -17812,7 +17980,7 @@ "primaryKey": false, "notNull": false, "autoIncrement": false, - "defaultValue": "0", + "defaultValue": "1", "hideInGraph": false, "refDict": "", "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811", @@ -19904,7 +20072,7 @@ "primaryKey": false, "notNull": false, "autoIncrement": false, - "defaultValue": "0", + "defaultValue": "1", "hideInGraph": false, "refDict": "", "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811", @@ -22896,7 +23064,7 @@ "primaryKey": false, "notNull": false, "autoIncrement": false, - "defaultValue": "0", + "defaultValue": "1", "hideInGraph": false, "refDict": "", "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811", @@ -27174,7 +27342,7 @@ "primaryKey": false, "notNull": false, "autoIncrement": false, - "defaultValue": "0", + "defaultValue": "1", "hideInGraph": false, "refDict": "", "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811", @@ -27669,7 +27837,7 @@ "primaryKey": false, "notNull": false, "autoIncrement": false, - "defaultValue": "0", + "defaultValue": "1", "hideInGraph": false, "refDict": "", "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811", @@ -33431,21 +33599,6 @@ "height": 400 } }, - { - "id": "ea1bfe60-06e7-4ea4-9806-2cdfd2243e99", - "shape": "table", - "position": { - "x": -2471, - "y": -190 - }, - "count": 0, - "originKey": "09ED4AD6-7277-4C33-B1DF-2CEAF99CE6D9", - "fillColor": "rgb(249, 186, 80)", - "size": { - "width": 406, - "height": 261 - } - }, { "id": "2d9b2212-c045-4a0a-93df-de2dbc7831d4", "shape": "table", @@ -33476,21 +33629,6 @@ "height": 284 } }, - { - "id": "c7c84fa6-f865-405e-96cf-891901511b9e", - "shape": "table", - "position": { - "x": -2471, - "y": 630 - }, - "count": 0, - "originKey": "ACBF0CDB-6D8F-4EA4-8715-F193DE655C3D", - "fillColor": "#bb19a4", - "size": { - "width": 370, - "height": 290 - } - }, { "id": "e0f93064-1a16-45cc-976f-5045684f8bb8", "shape": "table", @@ -33551,21 +33689,6 @@ "height": 307 } }, - { - "id": "9006e469-c7ec-4a02-8490-fa91ca885144", - "shape": "table", - "position": { - "x": -1456, - "y": -190 - }, - "count": 0, - "originKey": "AF982AE1-4589-4004-9C90-53166EFE4E88", - "fillColor": "rgb(249, 186, 80)", - "size": { - "width": 370, - "height": 261 - } - }, { "id": "544f84cd-d373-4d80-a581-cf2b03ce50f3", "shape": "table", @@ -33581,6 +33704,21 @@ "height": 238 } }, + { + "id": "bb81d81a-f50a-4694-b328-074318865758", + "shape": "table", + "position": { + "x": -977, + "y": 120 + }, + "count": 0, + "originKey": "23FC8723-F709-4B95-B772-901B7D3393AB", + "fillColor": "rgb(214, 74, 67)", + "size": { + "width": 457, + "height": 376 + } + }, { "id": "6fe6a7d3-ba72-4cd8-8358-4fe727a94fa6", "shape": "erdRelation", @@ -33742,6 +33880,51 @@ } } }, + { + "id": "9006e469-c7ec-4a02-8490-fa91ca885144", + "shape": "table", + "position": { + "x": -1456, + "y": -190 + }, + "count": 0, + "originKey": "AF982AE1-4589-4004-9C90-53166EFE4E88", + "fillColor": "rgb(249, 186, 80)", + "size": { + "width": 370, + "height": 261 + } + }, + { + "id": "ea1bfe60-06e7-4ea4-9806-2cdfd2243e99", + "shape": "table", + "position": { + "x": -2471, + "y": -190 + }, + "count": 0, + "originKey": "09ED4AD6-7277-4C33-B1DF-2CEAF99CE6D9", + "fillColor": "rgb(249, 186, 80)", + "size": { + "width": 406, + "height": 261 + } + }, + { + "id": "c7c84fa6-f865-405e-96cf-891901511b9e", + "shape": "table", + "position": { + "x": -2471, + "y": 630 + }, + "count": 0, + "originKey": "ACBF0CDB-6D8F-4EA4-8715-F193DE655C3D", + "fillColor": "#bb19a4", + "size": { + "width": 370, + "height": 290 + } + }, { "id": "a5807650-9349-42fd-8808-d775097dbe43", "shape": "table", @@ -33757,21 +33940,6 @@ "width": 420, "height": 410 } - }, - { - "id": "bb81d81a-f50a-4694-b328-074318865758", - "shape": "table", - "position": { - "x": -977, - "y": 120 - }, - "count": 0, - "originKey": "23FC8723-F709-4B95-B772-901B7D3393AB", - "fillColor": "rgb(214, 74, 67)", - "size": { - "width": 457, - "height": 376 - } } ] }, @@ -33784,37 +33952,6 @@ "relationType": "field", "canvasData": { "cells": [ - { - "id": "9342cfb1-3fcc-4f91-b407-52f06361b985", - "shape": "table", - "position": { - "x": -130.00000000000068, - "y": 36 - }, - "count": 0, - "originKey": "7023E66C-6118-440F-A59F-D3E1198D3C6A", - "type": "P", - "size": { - "width": 430, - "height": 238 - } - }, - { - "id": "efa8d7a3-8196-4e08-ae23-b83bd50c0d18", - "shape": "table", - "position": { - "x": -130.00000000000068, - "y": -280 - }, - "count": 0, - "originKey": "C6625631-7232-49D2-B900-4DD085F3E05C", - "fillColor": "rgb(90, 213, 198)", - "type": "P", - "size": { - "width": 430, - "height": 238 - } - }, { "id": "74bc2353-86be-454c-8f98-be9822a8cc54", "shape": "erdRelation", @@ -33872,50 +34009,6 @@ } } }, - { - "id": "98c7b124-a960-4fcd-bc04-9d40f94f6f15", - "shape": "table", - "position": { - "x": -820, - "y": -280 - }, - "count": 0, - "originKey": "99A289AA-C2BB-4F7B-B4FA-5F975A246269", - "fillColor": "rgb(214, 74, 67)", - "size": { - "width": 530, - "height": 330 - } - }, - { - "id": "89b89c1f-e6d8-4a98-a9bc-2264a149e029", - "shape": "table", - "position": { - "x": 410, - "y": -694.9999999999975 - }, - "count": 0, - "originKey": "65D51CF1-6969-4256-AA1E-D11DD38DF611", - "size": { - "width": 400, - "height": 290 - } - }, - { - "id": "1dc0e8d3-2fc6-4280-a900-7579054ff85c", - "shape": "table", - "position": { - "x": -130.00000000000068, - "y": -694.9999999999975 - }, - "count": 0, - "originKey": "1C4270A5-9DC1-4C3D-B5ED-FB549809289F", - "fillColor": "rgb(117, 190, 250)", - "size": { - "width": 430, - "height": 290 - } - }, { "id": "856f5c2b-e4f9-41ae-a354-d5127f91f805", "shape": "erdRelation", @@ -33929,15 +34022,59 @@ }, "relation": "1:n", "fillColor": "rgb(245, 220, 78)", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" } } }, + { + "id": "efa8d7a3-8196-4e08-ae23-b83bd50c0d18", + "shape": "table", + "position": { + "x": -130.00000000000068, + "y": -280 + }, + "count": 0, + "originKey": "C6625631-7232-49D2-B900-4DD085F3E05C", + "fillColor": "rgb(90, 213, 198)", + "type": "P", + "size": { + "width": 430, + "height": 238 + } + }, + { + "id": "9342cfb1-3fcc-4f91-b407-52f06361b985", + "shape": "table", + "position": { + "x": -130.00000000000068, + "y": 36 + }, + "count": 0, + "originKey": "7023E66C-6118-440F-A59F-D3E1198D3C6A", + "type": "P", + "size": { + "width": 430, + "height": 238 + } + }, + { + "id": "34db1608-e5b0-4235-bc06-cb54e21677a7", + "shape": "table", + "position": { + "x": -820, + "y": -699.9999999999975 + }, + "count": 0, + "originKey": "01397545-9811-4B87-AE3D-937A143AA6A0", + "fillColor": "rgb(245, 220, 78)", + "type": "P", + "size": { + "width": 530, + "height": 300 + } + }, { "id": "eaea197d-8030-4d92-8593-3308076aa8cb", "shape": "table", @@ -33954,19 +34091,47 @@ } }, { - "id": "34db1608-e5b0-4235-bc06-cb54e21677a7", + "id": "98c7b124-a960-4fcd-bc04-9d40f94f6f15", "shape": "table", "position": { "x": -820, - "y": -699.9999999999975 + "y": -280 }, "count": 0, - "originKey": "01397545-9811-4B87-AE3D-937A143AA6A0", - "fillColor": "rgb(245, 220, 78)", - "type": "P", + "originKey": "99A289AA-C2BB-4F7B-B4FA-5F975A246269", + "fillColor": "rgb(214, 74, 67)", "size": { "width": 530, - "height": 300 + "height": 330 + } + }, + { + "id": "1dc0e8d3-2fc6-4280-a900-7579054ff85c", + "shape": "table", + "position": { + "x": -130.00000000000068, + "y": -694.9999999999975 + }, + "count": 0, + "originKey": "1C4270A5-9DC1-4C3D-B5ED-FB549809289F", + "fillColor": "rgb(117, 190, 250)", + "size": { + "width": 430, + "height": 290 + } + }, + { + "id": "89b89c1f-e6d8-4a98-a9bc-2264a149e029", + "shape": "table", + "position": { + "x": 410, + "y": -694.9999999999975 + }, + "count": 0, + "originKey": "65D51CF1-6969-4256-AA1E-D11DD38DF611", + "size": { + "width": 400, + "height": 290 } } ] From 56fb568eaf469c0fed2bedf7614ba9a7eed0a839 Mon Sep 17 00:00:00 2001 From: MMS Date: Sat, 30 Aug 2025 21:56:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96doc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sxpcwlkj/system/controller/AuthController.java | 2 +- .../sxpcwlkj/system/controller/CaptchaController.java | 3 ++- .../sxpcwlkj/system/controller/CommonController.java | 4 +++- .../com/sxpcwlkj/system/controller/HomeController.java | 2 ++ .../system/controller/SysConfigController.java | 2 ++ .../sxpcwlkj/system/controller/SysDeptController.java | 2 ++ .../sxpcwlkj/system/controller/SysDictController.java | 3 ++- .../system/controller/SysFunctionController.java | 2 ++ .../system/controller/SysNoticeController.java | 2 ++ .../sxpcwlkj/system/controller/SysOssController.java | 5 ++++- .../sxpcwlkj/system/controller/SysRoleController.java | 2 ++ .../sxpcwlkj/system/controller/SysUserController.java | 2 ++ .../system/service/impl/CaptchaServiceImpl.java | 4 ++-- .../system/service/impl/SysDictServiceImpl.java | 5 +++-- .../system/service/impl/SysLoginServiceImpl.java | 10 +++++----- .../system/service/impl/SysRoleServiceImpl.java | 4 ++-- .../system/service/impl/SysUserServiceImpl.java | 2 +- .../src/main/resources/template/gen/vue/api.ts.ftl | 4 ++-- .../src/main/resources/template/gen/vue/dialog.vue.ftl | 8 +++++++- .../src/main/resources/template/gen/vue/index.vue.ftl | 4 +++- .../src/main/resources/template/gen/vue/type.ts.ftl | 4 ++-- 21 files changed, 53 insertions(+), 23 deletions(-) diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/AuthController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/AuthController.java index 8fcf19b..3316aa7 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/AuthController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/AuthController.java @@ -35,7 +35,7 @@ import java.util.Map; * @author mmsAdmin * @Doc MMS文档 */ -@Tag(name = "系统登录",description = "系统登录,鉴权") +@Tag(name = "系统管理模块-登录,鉴权",description = "系统管理模块-登录,鉴权") @Slf4j @Validated @RequiredArgsConstructor diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CaptchaController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CaptchaController.java index a22702b..efcf364 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CaptchaController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CaptchaController.java @@ -8,6 +8,7 @@ import com.sxpcwlkj.common.utils.DataUtil; import com.sxpcwlkj.common.utils.R; import com.sxpcwlkj.system.service.CaptchaService; import com.sxpcwlkj.system.service.SysTenantService; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -26,7 +27,7 @@ import java.util.Map; * @author mmsAdmin * @Doc MMS文档 */ - +@Tag(name = "系统管理模块-验证码处理",description = "系统管理模块-验证码处理") @Slf4j @Validated @RequiredArgsConstructor diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CommonController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CommonController.java index 087d3a4..42aeaf4 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CommonController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CommonController.java @@ -33,6 +33,7 @@ import com.sxpcwlkj.system.service.SysDictService; import com.sxpcwlkj.system.service.SysLoginService; import com.sxpcwlkj.system.service.SysUserService; import com.sxpcwlkj.wx.service.WxCodeService; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; @@ -50,6 +51,7 @@ import java.util.*; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-公共接口",description = "系统管理模块-公共接口") @RestController @RequiredArgsConstructor @Slf4j @@ -97,7 +99,7 @@ public class CommonController extends BaseController { map.put("loginType", DataUtil.getStringToList(smsConfigEntity.getConfigValue())); } if("sys_base_tenant_state".equals(smsConfigEntity.getConfigKey())){ - map.put("tenantState", Convert.toInt(smsConfigEntity.getConfigValue()) == 1); + map.put("tenantState", Convert.toInt(smsConfigEntity.getConfigValue()).equals(SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue())); } if("sys_base_login_bg".equals(smsConfigEntity.getConfigKey())){ map.put("loginBg",smsConfigEntity.getConfigValue()); diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/HomeController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/HomeController.java index 0cfd6fd..3db3d83 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/HomeController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/HomeController.java @@ -15,6 +15,7 @@ import com.sxpcwlkj.system.service.SysConfigService; import com.sxpcwlkj.system.service.SysFunctionService; import com.sxpcwlkj.system.service.SysNoticeService; import com.sxpcwlkj.system.service.SysUserService; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -29,6 +30,7 @@ import java.util.*; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-首页控制台",description = "系统管理模块-首页控制台") @RestController @RequiredArgsConstructor @RequestMapping("system/home") diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysConfigController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysConfigController.java index 049f66d..10ec220 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysConfigController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysConfigController.java @@ -12,6 +12,7 @@ import com.sxpcwlkj.sms.service.SmsService; import com.sxpcwlkj.system.entity.bo.SysConfigBo; import com.sxpcwlkj.system.entity.vo.SysConfigVo; import com.sxpcwlkj.system.service.SysConfigService; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; @@ -26,6 +27,7 @@ import java.util.List; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-系统配置",description = "系统管理模块-系统配置") @Slf4j @Validated @RequiredArgsConstructor diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysDeptController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysDeptController.java index 80602b7..f5b2814 100755 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysDeptController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysDeptController.java @@ -13,6 +13,7 @@ import com.sxpcwlkj.system.entity.bo.SysDeptBo; import com.sxpcwlkj.system.entity.export.SysDeptExport; import com.sxpcwlkj.system.entity.vo.SysDeptVo; import com.sxpcwlkj.system.service.SysDeptService; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -31,6 +32,7 @@ import java.util.Set; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-系统部门",description = "系统管理模块-系统部门") @Slf4j @Validated @RequiredArgsConstructor diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysDictController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysDictController.java index 42df3e5..553c2af 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysDictController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysDictController.java @@ -9,6 +9,7 @@ import com.sxpcwlkj.framework.config.ValidatedGroupConfig; import com.sxpcwlkj.system.entity.bo.SysDictBo; import com.sxpcwlkj.system.entity.vo.SysDictVo; import com.sxpcwlkj.system.service.SysDictService; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-系统字典",description = "系统管理模块-系统字典") @RequestMapping("system/dict") @RestController @RequiredArgsConstructor @@ -30,7 +32,6 @@ public class SysDictController extends BaseController { * 分页查询字典列表 * * @param bo 查询条件 - * @param pageQuery 分页条件 * @return 分页结果 */ @MssSafety diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysFunctionController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysFunctionController.java index 4eb1049..c16a080 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysFunctionController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysFunctionController.java @@ -9,6 +9,7 @@ import com.sxpcwlkj.system.entity.AdminMenuTree; import com.sxpcwlkj.system.entity.bo.SysFunctionBo; import com.sxpcwlkj.system.entity.vo.SysFunctionVo; import com.sxpcwlkj.system.service.SysFunctionService; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; @@ -22,6 +23,7 @@ import java.util.List; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-系统资源",description = "系统管理模块-系统资源") @RequestMapping("system/function") @RestController @RequiredArgsConstructor diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysNoticeController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysNoticeController.java index 6f38122..406eee0 100755 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysNoticeController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysNoticeController.java @@ -13,6 +13,7 @@ import com.sxpcwlkj.system.entity.bo.SysNoticeBo; import com.sxpcwlkj.system.entity.export.SysNoticeExport; import com.sxpcwlkj.system.entity.vo.SysNoticeVo; import com.sxpcwlkj.system.service.SysNoticeService; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -31,6 +32,7 @@ import java.util.Set; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-系统公告",description = "系统管理模块-系统公告") @Slf4j @Validated @RequiredArgsConstructor diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysOssController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysOssController.java index a277c9d..7f15109 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysOssController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysOssController.java @@ -5,6 +5,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; import com.sxpcwlkj.common.annotation.MssSafety; import com.sxpcwlkj.common.code.controller.BaseController; +import com.sxpcwlkj.common.enums.SystemCommonEnum; import com.sxpcwlkj.common.utils.R; import com.sxpcwlkj.datasource.entity.page.TableDataInfo; import com.sxpcwlkj.framework.config.ValidatedGroupConfig; @@ -15,6 +16,7 @@ import com.sxpcwlkj.system.entity.vo.SysOssConfigVo; import com.sxpcwlkj.system.entity.vo.SysOssVo; import com.sxpcwlkj.system.service.SysOssConfigService; import com.sxpcwlkj.system.service.SysOssService; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.dromara.x.file.storage.core.FileInfo; import org.dromara.x.file.storage.core.FileStorageService; @@ -28,6 +30,7 @@ import org.springframework.web.multipart.MultipartFile; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-对象存储",description = "系统管理模块-对象存储") @RequestMapping("system/oss") @RestController @RequiredArgsConstructor @@ -87,7 +90,7 @@ public class SysOssController extends BaseController { sysOssBo.setPlatform(fileInfo.getPlatform()); sysOssBo.setContentType(fileInfo.getContentType()); sysOssBo.setBasePath(fileInfo.getBasePath()); - sysOssBo.setStatus(0); + sysOssBo.setStatus(SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()); sysOssBo.setSort(0); return success(baseService.insert(sysOssBo)); } diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysRoleController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysRoleController.java index 97e3f33..4befc7e 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysRoleController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysRoleController.java @@ -9,6 +9,7 @@ import com.sxpcwlkj.framework.config.ValidatedGroupConfig; import com.sxpcwlkj.system.entity.bo.SysRoleBo; import com.sxpcwlkj.system.entity.vo.SysRoleVo; import com.sxpcwlkj.system.service.SysRoleService; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-系统角色",description = "系统管理模块-系统角色") @RequestMapping("system/role") @RestController @RequiredArgsConstructor diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysUserController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysUserController.java index cfde104..c28218a 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysUserController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysUserController.java @@ -21,6 +21,7 @@ import com.sxpcwlkj.system.entity.export.SysUserExportVo; import com.sxpcwlkj.system.entity.vo.SysUserVo; import com.sxpcwlkj.system.service.SysUserService; import com.sxpcwlkj.wx.service.WxCodeService; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; @@ -42,6 +43,7 @@ import java.util.Set; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-系统用户",description = "系统管理模块-系统用户") @Slf4j @Validated @RequiredArgsConstructor diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/CaptchaServiceImpl.java b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/CaptchaServiceImpl.java index f59aebc..48c0b57 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/CaptchaServiceImpl.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/CaptchaServiceImpl.java @@ -41,7 +41,7 @@ public class CaptchaServiceImpl implements CaptchaService { // msg：验证码未开启 List convert = RedisUtil.getCacheList(ConfigKeyNum.config_base.getKey()); AtomicBoolean isOpen= new AtomicBoolean(false); - Map map = new HashMap<>(); + if(convert.isEmpty()){ return data; } @@ -72,7 +72,7 @@ public class CaptchaServiceImpl implements CaptchaService { //初始化验证码背景 - if (!code.equals("000000")) { + if (!"000000".equals(code)) { switch (captchaProperties.getType()) { case "LINE": diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysDictServiceImpl.java b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysDictServiceImpl.java index 9ac876b..36d97b8 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysDictServiceImpl.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysDictServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sxpcwlkj.common.constant.CacheConstants; +import com.sxpcwlkj.common.enums.SystemCommonEnum; import com.sxpcwlkj.common.utils.MapstructUtil; import com.sxpcwlkj.datasource.entity.page.PageQuery; import com.sxpcwlkj.datasource.entity.page.TableDataInfo; @@ -128,7 +129,7 @@ public class SysDictServiceImpl implements SysDictService { for (SysDict d : dicts) { List data = sysDictDataMapper.selectList(new LambdaQueryWrapper() .eq(SysDictData::getFieldName, d.getFieldName()) - .eq(SysDictData::getStatus, 0) + .eq(SysDictData::getStatus, SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()) .orderByAsc(SysDictData::getSort) ); RedisUtil.deleteObject(CacheConstants.SYS_DICT_KEY + d.getFieldName()); @@ -145,7 +146,7 @@ public class SysDictServiceImpl implements SysDictService { @Override public List getSysDictByCode(String code) { return sysDictDataMapper.selectVoList(new LambdaQueryWrapper().eq(SysDictData::getFieldName, code) - .eq(SysDictData::getStatus, 0).orderByAsc(SysDictData::getSort)); + .eq(SysDictData::getStatus, SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()).orderByAsc(SysDictData::getSort)); } @Override diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysLoginServiceImpl.java b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysLoginServiceImpl.java index ae4fc20..12b5cde 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysLoginServiceImpl.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysLoginServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.sxpcwlkj.authority.LoginObject; import com.sxpcwlkj.common.code.entity.CaptchaEntity; import com.sxpcwlkj.common.enums.DeviceEnum; +import com.sxpcwlkj.common.enums.SystemCommonEnum; import com.sxpcwlkj.common.exception.LoginException; import com.sxpcwlkj.common.exception.MmsException; import com.sxpcwlkj.common.exception.TenantException; @@ -30,8 +31,7 @@ import java.util.Date; import java.util.Map; /** - * @ClassName SysLoginServiceImpl - * @Description TODO + * 系统登录 * @Author mmsAdmin * @Date 2022/12/25 12:06 */ @@ -62,7 +62,7 @@ public class SysLoginServiceImpl implements SysLoginService { throw new LoginException("账号不存在!"); } // 账号是否禁用 - if (sysUser.getStatus() != 0) { + if (!sysUser.getStatus().equals(SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue())) { throw new LoginException("账号已禁用!"); } //解密数据库的密码 @@ -121,7 +121,7 @@ public class SysLoginServiceImpl implements SysLoginService { /** * 验证租户 * - * @param sysUser + * @param sysUser 用户 */ @Override public void verfyTenement(SysUser sysUser) { @@ -132,7 +132,7 @@ public class SysLoginServiceImpl implements SysLoginService { log.info("登录用户ID：{} 租户不存在.", sysUser.getUserId()); throw new TenantException("tenant.not.exists"); } - if (sysTenant.getStatus() != 0) { + if (!sysTenant.getStatus().equals(SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue())) { log.info("登录用户ID：{} 租户状态为禁用.", sysUser.getUserId()); throw new TenantException("tenant off state"); } diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysRoleServiceImpl.java b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysRoleServiceImpl.java index e2b72ba..2c73aca 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysRoleServiceImpl.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysRoleServiceImpl.java @@ -103,7 +103,7 @@ public class SysRoleServiceImpl implements SysRoleService { SysRoleFunction roleFunction = new SysRoleFunction(); roleFunction.setRoleId(bo.getId()); roleFunction.setFunctionId(aLong); - roleFunction.setStatus(1); + roleFunction.setStatus(SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()); sysRoleFunctionMapper.insert(roleFunction); } } @@ -129,7 +129,7 @@ public class SysRoleServiceImpl implements SysRoleService { SysRoleFunction role = new SysRoleFunction(); role.setRoleId(roleId); role.setFunctionId(sysRoleFunction.getParentId()); - role.setStatus(0); + role.setStatus(SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()); sysRoleFunctionMapper.insert(role); checkFunction(sysRoleFunction.getParentId(), roleId); } diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysUserServiceImpl.java b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysUserServiceImpl.java index 3326293..09c0362 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysUserServiceImpl.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysUserServiceImpl.java @@ -258,7 +258,7 @@ public class SysUserServiceImpl implements SysUserService { //资源集 userVo.setButCodes(list.toArray(String[]::new)); //===================超级管理员拥有所有========================== - if (userVo.getUserId().toString().equals(SystemCommonEnum.SUPER_ADMIN.getValue().toString())) { + if (userVo.getUserId().equals(SystemCommonEnum.SUPER_ADMIN.getValue().toString())) { sysRoles = sysRoleMapper.selectList(new LambdaQueryWrapper().eq(SysRole::getCode, SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()).like(SysRole::getCode, SystemCommonEnum.SUPER_ADMIN.getCode()).orderByAsc(SysRole::getSort).last("LIMIT 1")); sysRoleVos = BeanCopyUtil.convert(sysRoles, SysRoleVo.class); diff --git a/mms-admin/src/main/resources/template/gen/vue/api.ts.ftl b/mms-admin/src/main/resources/template/gen/vue/api.ts.ftl index 3a4b9ca..232c2d8 100644 --- a/mms-admin/src/main/resources/template/gen/vue/api.ts.ftl +++ b/mms-admin/src/main/resources/template/gen/vue/api.ts.ftl @@ -3,14 +3,14 @@ import {getEnv} from "/@/utils/mms"; import {AxiosPromise} from "axios"; import {SysEnum} from "/@/enums/SysEnum"; import {EncryptTypeEnum} from "/@/enums/EncryptTypeEnum"; -import {${FunctionName}Bo,${FunctionName}Vo,${FunctionName}Table } from '/@/views/${moduleName}/${functionName}/type'; +import {${FunctionName}Bo,${FunctionName}Vo} from '/@/views/${moduleName}/${functionName}/type'; /** * ${tableComment}-Api * ${FunctionName} */ export function ${functionName}Api() { return { - list: (params?: object): AxiosPromise<${FunctionName}Vo[]> => { + list: (params?: object): AxiosPromise> => { return request({ url: getEnv()+'/${moduleName}/${functionName}/list', method: 'post', diff --git a/mms-admin/src/main/resources/template/gen/vue/dialog.vue.ftl b/mms-admin/src/main/resources/template/gen/vue/dialog.vue.ftl index 5d1962b..4c715f0 100644 --- a/mms-admin/src/main/resources/template/gen/vue/dialog.vue.ftl +++ b/mms-admin/src/main/resources/template/gen/vue/dialog.vue.ftl @@ -135,17 +135,23 @@