张延森 3 years ago
parent
commit
c54c5e2dde
2 changed files with 299 additions and 170 deletions
  1. 280
    168
      南阳智慧农机系统-backup-202238140151.chnr.json
  2. 19
    2
      南阳智慧农机系统.chnr.json

南阳智慧农机系统-backup-202238113810.chnr.json → 南阳智慧农机系统-backup-202238140151.chnr.json View File

@@ -4,7 +4,7 @@
4 4
   "avatar": "",
5 5
   "version": "3.5.7",
6 6
   "createdTime": "2022-3-3 17:23:46",
7
-  "updatedTime": "2022-3-8 11:36:59",
7
+  "updatedTime": "2022-3-8 11:46:00",
8 8
   "profile": {
9 9
     "default": {
10 10
       "db": "BCC84CFF-0541-44EC-A578-03D02506BD5B",
@@ -2586,9 +2586,57 @@
2586 2586
           "id": "8A646917-49CD-4957-B29C-C4B6A67AA19D"
2587 2587
         },
2588 2588
         {
2589
-          "defKey": "push_person",
2590
-          "defName": "推送对象",
2591
-          "comment": "1农户 2农机手",
2589
+          "defKey": "content",
2590
+          "defName": "消息内容",
2591
+          "comment": "",
2592
+          "type": "",
2593
+          "len": "",
2594
+          "scale": "",
2595
+          "primaryKey": false,
2596
+          "notNull": false,
2597
+          "autoIncrement": false,
2598
+          "defaultValue": "",
2599
+          "hideInGraph": false,
2600
+          "refDict": "",
2601
+          "domain": "4065DD45-6E7F-4C81-8D0A-0688748B3F0F",
2602
+          "id": "315F8E16-6B08-4786-B66C-C35AB9A6A2CC"
2603
+        },
2604
+        {
2605
+          "defKey": "receiver_target",
2606
+          "defName": "接收人类型",
2607
+          "comment": "",
2608
+          "type": "",
2609
+          "len": "",
2610
+          "scale": "",
2611
+          "primaryKey": false,
2612
+          "notNull": false,
2613
+          "autoIncrement": false,
2614
+          "defaultValue": "",
2615
+          "hideInGraph": false,
2616
+          "refDict": "",
2617
+          "domain": "4065DD45-6E7F-4C81-8D0A-0688748B3F0F",
2618
+          "id": "4CE45D8E-8BA2-47D2-97F8-7A377F106FCD"
2619
+        },
2620
+        {
2621
+          "defKey": "receiver_id",
2622
+          "defName": "接收人ID",
2623
+          "comment": "",
2624
+          "type": "",
2625
+          "len": "",
2626
+          "scale": "",
2627
+          "primaryKey": false,
2628
+          "notNull": false,
2629
+          "autoIncrement": false,
2630
+          "defaultValue": "",
2631
+          "hideInGraph": false,
2632
+          "refDict": "",
2633
+          "domain": "4065DD45-6E7F-4C81-8D0A-0688748B3F0F",
2634
+          "id": "15C1B36F-D2CA-4A9B-8E7F-8F7BC9144FFA"
2635
+        },
2636
+        {
2637
+          "defKey": "receiver_port",
2638
+          "defName": "接收端",
2639
+          "comment": "",
2592 2640
           "domain": "4065DD45-6E7F-4C81-8D0A-0688748B3F0F",
2593 2641
           "type": "",
2594 2642
           "len": "",
@@ -2605,7 +2653,7 @@
2605 2653
         {
2606 2654
           "defKey": "push_mode",
2607 2655
           "defName": "推送方式",
2608
-          "comment": "1通知栏推送 2APP内消息中心推送 3短信推送",
2656
+          "comment": "",
2609 2657
           "domain": "4065DD45-6E7F-4C81-8D0A-0688748B3F0F",
2610 2658
           "type": "",
2611 2659
           "len": "",
@@ -2620,7 +2668,7 @@
2620 2668
           "id": "18F11CD3-8D04-449E-9C54-C15BC4ADF57C"
2621 2669
         },
2622 2670
         {
2623
-          "defKey": "start_time",
2671
+          "defKey": "push_time",
2624 2672
           "defName": "推送时间",
2625 2673
           "comment": "",
2626 2674
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2637,9 +2685,9 @@
2637 2685
           "id": "4419DF44-4CC8-4A3E-A0A6-CF30F8DA0AC3"
2638 2686
         },
2639 2687
         {
2640
-          "defKey": "extend_content",
2641
-          "defName": "推送内容",
2642
-          "comment": "图文列表",
2688
+          "defKey": "push_result",
2689
+          "defName": "推送结果",
2690
+          "comment": "",
2643 2691
           "type": "",
2644 2692
           "len": "",
2645 2693
           "scale": "",
@@ -2650,6 +2698,22 @@
2650 2698
           "hideInGraph": false,
2651 2699
           "refDict": "",
2652 2700
           "domain": "3D63F48C-F42F-48B7-AF3B-2E97DAB66934",
2701
+          "id": "2627A6BF-55F3-4042-A169-46FC4181F262"
2702
+        },
2703
+        {
2704
+          "defKey": "status",
2705
+          "defName": "状态",
2706
+          "comment": "",
2707
+          "type": "",
2708
+          "len": "",
2709
+          "scale": "",
2710
+          "primaryKey": false,
2711
+          "notNull": false,
2712
+          "autoIncrement": false,
2713
+          "defaultValue": "0",
2714
+          "hideInGraph": false,
2715
+          "refDict": "",
2716
+          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
2653 2717
           "id": "064A99EE-AF85-43BF-96C8-263C2FD1E813"
2654 2718
         },
2655 2719
         {
@@ -3224,163 +3288,6 @@
3224 3288
       "correlations": [],
3225 3289
       "indexes": []
3226 3290
     },
3227
-    {
3228
-      "id": "DC23EA42-FBE4-48A8-B2D0-1728B2C5E58E",
3229
-      "defKey": "ta_attendance",
3230
-      "defName": "出勤表",
3231
-      "comment": "",
3232
-      "properties": {},
3233
-      "nameTemplate": "{defKey}[{defName}]",
3234
-      "headers": [
3235
-        {
3236
-          "freeze": false,
3237
-          "refKey": "hideInGraph",
3238
-          "hideInGraph": true
3239
-        },
3240
-        {
3241
-          "freeze": true,
3242
-          "refKey": "defKey",
3243
-          "hideInGraph": false
3244
-        },
3245
-        {
3246
-          "freeze": true,
3247
-          "refKey": "defName",
3248
-          "hideInGraph": false
3249
-        },
3250
-        {
3251
-          "freeze": false,
3252
-          "refKey": "primaryKey",
3253
-          "hideInGraph": false
3254
-        },
3255
-        {
3256
-          "freeze": false,
3257
-          "refKey": "notNull",
3258
-          "hideInGraph": true
3259
-        },
3260
-        {
3261
-          "freeze": false,
3262
-          "refKey": "autoIncrement",
3263
-          "hideInGraph": true
3264
-        },
3265
-        {
3266
-          "freeze": false,
3267
-          "refKey": "domain",
3268
-          "hideInGraph": true
3269
-        },
3270
-        {
3271
-          "freeze": false,
3272
-          "refKey": "type",
3273
-          "hideInGraph": false
3274
-        },
3275
-        {
3276
-          "freeze": false,
3277
-          "refKey": "len",
3278
-          "hideInGraph": false
3279
-        },
3280
-        {
3281
-          "freeze": false,
3282
-          "refKey": "scale",
3283
-          "hideInGraph": false
3284
-        },
3285
-        {
3286
-          "freeze": false,
3287
-          "refKey": "comment",
3288
-          "hideInGraph": true
3289
-        },
3290
-        {
3291
-          "freeze": false,
3292
-          "refKey": "refDict",
3293
-          "hideInGraph": true
3294
-        },
3295
-        {
3296
-          "freeze": false,
3297
-          "refKey": "defaultValue",
3298
-          "hideInGraph": true
3299
-        },
3300
-        {
3301
-          "freeze": false,
3302
-          "refKey": "isStandard",
3303
-          "hideInGraph": false
3304
-        },
3305
-        {
3306
-          "freeze": false,
3307
-          "refKey": "uiHint",
3308
-          "hideInGraph": true
3309
-        }
3310
-      ],
3311
-      "fields": [
3312
-        {
3313
-          "defKey": "attendance_id",
3314
-          "defName": "出勤id",
3315
-          "comment": "",
3316
-          "type": "",
3317
-          "len": 32,
3318
-          "scale": "",
3319
-          "primaryKey": true,
3320
-          "notNull": true,
3321
-          "autoIncrement": false,
3322
-          "defaultValue": "",
3323
-          "hideInGraph": false,
3324
-          "domain": "FC46C793-A15E-495E-80C7-2BEC7A472CD0",
3325
-          "refDict": "",
3326
-          "uiHint": "",
3327
-          "id": "F486BEC1-0EC5-4E58-A423-DC1C3B8DBE10"
3328
-        },
3329
-        {
3330
-          "defKey": "owner_id",
3331
-          "defName": "农机手Id",
3332
-          "comment": "",
3333
-          "domain": "FC46C793-A15E-495E-80C7-2BEC7A472CD0",
3334
-          "type": "",
3335
-          "len": 32,
3336
-          "scale": "",
3337
-          "primaryKey": false,
3338
-          "notNull": false,
3339
-          "autoIncrement": false,
3340
-          "defaultValue": "",
3341
-          "hideInGraph": false,
3342
-          "refDict": "",
3343
-          "uiHint": "",
3344
-          "id": "9EFCF0AD-510F-4541-B0A5-CC9E6F2BA0B5"
3345
-        },
3346
-        {
3347
-          "defKey": "state",
3348
-          "defName": "状态",
3349
-          "comment": "1预约 2确认 3完成 0取消",
3350
-          "domain": "3D63F48C-F42F-48B7-AF3B-2E97DAB66934",
3351
-          "type": "",
3352
-          "len": "",
3353
-          "scale": "",
3354
-          "primaryKey": false,
3355
-          "notNull": false,
3356
-          "autoIncrement": false,
3357
-          "defaultValue": "",
3358
-          "hideInGraph": false,
3359
-          "refDict": "",
3360
-          "uiHint": "",
3361
-          "id": "474D9109-2E1E-4CB2-86EA-73A8027FA76C"
3362
-        },
3363
-        {
3364
-          "defKey": "create_date",
3365
-          "defName": "创建时间",
3366
-          "comment": "",
3367
-          "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
3368
-          "type": "",
3369
-          "len": "",
3370
-          "scale": "",
3371
-          "primaryKey": false,
3372
-          "notNull": false,
3373
-          "autoIncrement": false,
3374
-          "defaultValue": "CURRENT_TIMESTAMP",
3375
-          "hideInGraph": false,
3376
-          "refDict": "",
3377
-          "uiHint": "",
3378
-          "id": "115C7664-AC19-4D87-AAD6-FCAE668DC6B2"
3379
-        }
3380
-      ],
3381
-      "correlations": [],
3382
-      "indexes": []
3383
-    },
3384 3291
     {
3385 3292
       "id": "CB499081-1FC3-403E-8EA9-46B365EDD608",
3386 3293
       "defKey": "ta_evaluation",
@@ -6381,7 +6288,7 @@
6381 6288
     },
6382 6289
     {
6383 6290
       "id": "FBF7A834-7EEE-42B6-B75A-F75810DEA516",
6384
-      "defKey": "system_setting",
6291
+      "defKey": "sys_setting",
6385 6292
       "defName": "系统设置",
6386 6293
       "comment": "",
6387 6294
       "properties": {},
@@ -7176,6 +7083,210 @@
7176 7083
       ],
7177 7084
       "correlations": [],
7178 7085
       "indexes": []
7086
+    },
7087
+    {
7088
+      "id": "3301C9E1-DEA9-427E-A856-8DA710E09947",
7089
+      "defKey": "ta_feedback",
7090
+      "defName": "意见反馈",
7091
+      "comment": "",
7092
+      "properties": {},
7093
+      "nameTemplate": "{defKey}[{defName}]",
7094
+      "headers": [
7095
+        {
7096
+          "freeze": false,
7097
+          "refKey": "hideInGraph",
7098
+          "hideInGraph": true
7099
+        },
7100
+        {
7101
+          "freeze": true,
7102
+          "refKey": "defKey",
7103
+          "hideInGraph": false
7104
+        },
7105
+        {
7106
+          "freeze": true,
7107
+          "refKey": "defName",
7108
+          "hideInGraph": false
7109
+        },
7110
+        {
7111
+          "freeze": false,
7112
+          "refKey": "primaryKey",
7113
+          "hideInGraph": false
7114
+        },
7115
+        {
7116
+          "freeze": false,
7117
+          "refKey": "notNull",
7118
+          "hideInGraph": true
7119
+        },
7120
+        {
7121
+          "freeze": false,
7122
+          "refKey": "autoIncrement",
7123
+          "hideInGraph": true
7124
+        },
7125
+        {
7126
+          "freeze": false,
7127
+          "refKey": "domain",
7128
+          "hideInGraph": true
7129
+        },
7130
+        {
7131
+          "freeze": false,
7132
+          "refKey": "type",
7133
+          "hideInGraph": false
7134
+        },
7135
+        {
7136
+          "freeze": false,
7137
+          "refKey": "len",
7138
+          "hideInGraph": false
7139
+        },
7140
+        {
7141
+          "freeze": false,
7142
+          "refKey": "scale",
7143
+          "hideInGraph": false
7144
+        },
7145
+        {
7146
+          "freeze": false,
7147
+          "refKey": "comment",
7148
+          "hideInGraph": true
7149
+        },
7150
+        {
7151
+          "freeze": false,
7152
+          "refKey": "refDict",
7153
+          "hideInGraph": true
7154
+        },
7155
+        {
7156
+          "freeze": false,
7157
+          "refKey": "defaultValue",
7158
+          "hideInGraph": true
7159
+        },
7160
+        {
7161
+          "freeze": false,
7162
+          "refKey": "isStandard",
7163
+          "hideInGraph": false
7164
+        },
7165
+        {
7166
+          "freeze": false,
7167
+          "refKey": "uiHint",
7168
+          "hideInGraph": true
7169
+        }
7170
+      ],
7171
+      "fields": [
7172
+        {
7173
+          "defKey": "feedback_id",
7174
+          "defName": "反馈ID",
7175
+          "comment": "",
7176
+          "type": "",
7177
+          "len": 32,
7178
+          "scale": "",
7179
+          "primaryKey": true,
7180
+          "notNull": true,
7181
+          "autoIncrement": false,
7182
+          "defaultValue": "",
7183
+          "hideInGraph": true,
7184
+          "domain": "FC46C793-A15E-495E-80C7-2BEC7A472CD0",
7185
+          "refDict": "",
7186
+          "uiHint": "",
7187
+          "id": "7EB416C4-D380-47FC-8FD0-02A75E7AC781"
7188
+        },
7189
+        {
7190
+          "defKey": "from_port",
7191
+          "defName": "反馈端口",
7192
+          "comment": "",
7193
+          "type": "",
7194
+          "len": "",
7195
+          "scale": "",
7196
+          "primaryKey": false,
7197
+          "notNull": false,
7198
+          "autoIncrement": false,
7199
+          "defaultValue": "",
7200
+          "hideInGraph": false,
7201
+          "refDict": "",
7202
+          "domain": "CE02052D-E6C4-4ED8-BB44-24CB2550C912",
7203
+          "id": "589F6B6D-8D75-4C08-9634-112493199976"
7204
+        },
7205
+        {
7206
+          "defKey": "from_person",
7207
+          "defName": "反馈人ID",
7208
+          "comment": "",
7209
+          "type": "",
7210
+          "len": "",
7211
+          "scale": "",
7212
+          "primaryKey": false,
7213
+          "notNull": false,
7214
+          "autoIncrement": false,
7215
+          "defaultValue": "",
7216
+          "hideInGraph": false,
7217
+          "refDict": "",
7218
+          "domain": "4065DD45-6E7F-4C81-8D0A-0688748B3F0F",
7219
+          "id": "86FA525F-FC32-4591-8DDE-3F6C39BECDCA"
7220
+        },
7221
+        {
7222
+          "defKey": "content",
7223
+          "defName": "反馈内容",
7224
+          "comment": "",
7225
+          "type": "",
7226
+          "len": "",
7227
+          "scale": "",
7228
+          "primaryKey": false,
7229
+          "notNull": false,
7230
+          "autoIncrement": false,
7231
+          "defaultValue": "",
7232
+          "hideInGraph": false,
7233
+          "refDict": "",
7234
+          "domain": "3D63F48C-F42F-48B7-AF3B-2E97DAB66934",
7235
+          "id": "5C57B18C-DEC4-40A4-B85D-51960E21A35B"
7236
+        },
7237
+        {
7238
+          "defKey": "result",
7239
+          "defName": "处理结果",
7240
+          "comment": "",
7241
+          "type": "",
7242
+          "len": "",
7243
+          "scale": "",
7244
+          "primaryKey": false,
7245
+          "notNull": false,
7246
+          "autoIncrement": false,
7247
+          "defaultValue": "",
7248
+          "hideInGraph": false,
7249
+          "refDict": "",
7250
+          "domain": "3D63F48C-F42F-48B7-AF3B-2E97DAB66934",
7251
+          "id": "6D4297A1-7047-4107-B18A-B660FA831F19"
7252
+        },
7253
+        {
7254
+          "defKey": "status",
7255
+          "defName": "状态",
7256
+          "comment": "",
7257
+          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
7258
+          "type": "",
7259
+          "len": "",
7260
+          "scale": "",
7261
+          "primaryKey": false,
7262
+          "notNull": false,
7263
+          "autoIncrement": false,
7264
+          "defaultValue": "1",
7265
+          "hideInGraph": true,
7266
+          "refDict": "",
7267
+          "uiHint": "",
7268
+          "id": "78B5EE48-71CF-4A62-9941-DE3D58C177B9"
7269
+        },
7270
+        {
7271
+          "defKey": "create_date",
7272
+          "defName": "创建时间",
7273
+          "comment": "",
7274
+          "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
7275
+          "type": "",
7276
+          "len": "",
7277
+          "scale": "",
7278
+          "primaryKey": false,
7279
+          "notNull": false,
7280
+          "autoIncrement": false,
7281
+          "defaultValue": "CURRENT_TIMESTAMP",
7282
+          "hideInGraph": true,
7283
+          "refDict": "",
7284
+          "uiHint": "",
7285
+          "id": "74C4CEDB-BFCB-467A-A0B9-D49695409922"
7286
+        }
7287
+      ],
7288
+      "correlations": [],
7289
+      "indexes": []
7179 7290
     }
7180 7291
   ],
7181 7292
   "views": [],
@@ -7229,7 +7340,8 @@
7229 7340
         "BD0323B9-65A1-4515-BF22-F8C82258765D",
7230 7341
         "B59E0790-9AD4-400B-B7C0-836354AD1847",
7231 7342
         "5D13B567-29D9-4702-9916-DF69DF223EA0",
7232
-        "82C4342E-254E-4FEF-A60A-ABEF9365B33C"
7343
+        "82C4342E-254E-4FEF-A60A-ABEF9365B33C",
7344
+        "3301C9E1-DEA9-427E-A856-8DA710E09947"
7233 7345
       ],
7234 7346
       "refViews": [],
7235 7347
       "refDiagrams": [],

+ 19
- 2
南阳智慧农机系统.chnr.json View File

@@ -4,7 +4,7 @@
4 4
   "avatar": "",
5 5
   "version": "3.5.7",
6 6
   "createdTime": "2022-3-3 17:23:46",
7
-  "updatedTime": "2022-3-8 11:46:00",
7
+  "updatedTime": "2022-3-8 14:01:51",
8 8
   "profile": {
9 9
     "default": {
10 10
       "db": "BCC84CFF-0541-44EC-A578-03D02506BD5B",
@@ -5466,7 +5466,24 @@
5466 5466
           "hideInGraph": true
5467 5467
         }
5468 5468
       ],
5469
-      "fields": [],
5469
+      "fields": [
5470
+        {
5471
+          "defKey": "id",
5472
+          "defName": "id",
5473
+          "comment": "",
5474
+          "type": "",
5475
+          "len": "",
5476
+          "scale": "",
5477
+          "primaryKey": false,
5478
+          "notNull": false,
5479
+          "autoIncrement": false,
5480
+          "defaultValue": "",
5481
+          "hideInGraph": false,
5482
+          "refDict": "",
5483
+          "domain": "4065DD45-6E7F-4C81-8D0A-0688748B3F0F",
5484
+          "id": "FC4E87E4-9F6E-4CF8-A3C4-E792B759827D"
5485
+        }
5486
+      ],
5470 5487
       "correlations": [],
5471 5488
       "indexes": []
5472 5489
     },