From 7eaecd6bf652b313c22c3d127017aba647ba97bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Mon, 9 Dec 2024 11:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=88=E6=81=AF=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../module/workman/model/WorkmanEntity.java | 22 ++++++++++++------
portal-manager/db/add.sql | 23 +++++++++++++++----
2 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/workman/model/WorkmanEntity.java b/base-manager/src/main/java/com/mortals/xhx/module/workman/model/WorkmanEntity.java
index a988ba4f..baece771 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/workman/model/WorkmanEntity.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/workman/model/WorkmanEntity.java
@@ -1,13 +1,7 @@
package com.mortals.xhx.module.workman.model;
import java.util.Date;
-import java.util.List;
-import java.util.ArrayList;
-import java.math.BigDecimal;
-import cn.hutool.core.date.DateUtil;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
import com.mortals.framework.annotation.Excel;
-import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.workman.model.vo.WorkmanVo;
import lombok.Data;
/**
@@ -23,10 +17,12 @@ public class WorkmanEntity extends WorkmanVo {
/**
* 鐧诲綍鐢ㄦ埛鍚�
*/
+ @Excel(name = "鐢ㄦ埛鍚�")
private String loginName;
/**
* 瀵嗙爜
*/
+ @Excel(name = "瀵嗙爜")
private String loginPwd;
/**
* 閮ㄩ棬id鍙�
@@ -55,14 +51,17 @@ public class WorkmanEntity extends WorkmanVo {
/**
* 濮撳悕
*/
+ @Excel(name = "濮撳悕")
private String name;
/**
* 宸ュ彿
*/
+ @Excel(name = "宸ュ彿")
private String number;
/**
* 鑱屽姟
*/
+ @Excel(name = "鑱屽姟")
private String userpost;
/**
* 鑱岀О
@@ -71,10 +70,12 @@ public class WorkmanEntity extends WorkmanVo {
/**
* 鏀挎不闈㈣矊 锛�0.涓叡鍏氬憳锛�1.涓叡棰勫鍏氬憳锛�2.鍏遍潚鍥㈠憳锛�3.鏅€氬眳姘戯紝4.鍏跺畠)
*/
+ @Excel(name = "鏀挎不闈㈣矊 ",combo={"涓叡鍏氬憳","涓叡棰勫鍏氬憳","鍏遍潚鍥㈠憳","鏅€氬眳姘�","鍏跺畠"}, readConverterExp = "0=涓叡鍏氬憳,1=涓叡棰勫鍏氬憳,2=鍏遍潚鍥㈠憳,3=鏅€氬眳姘�,4=鍏跺畠")
private Integer politicalstatus;
/**
* 鍏氬憳 锛�0.闈炲厷鍛橈紝1.鍏氬憳锛�2.鍏氬憳绀鸿寖宀楋紝3.鍏氬憳鍏堥攱宀�)
*/
+ @Excel(name = "鍏氬憳 ",combo={"闈炲厷鍛�","鍏氬憳","鍏氬憳绀鸿寖宀�","鍏氬憳鍏堥攱宀�"}, readConverterExp = "0=闈炲厷鍛�,1=鍏氬憳,2=鍏氬憳绀鸿寖宀�,3=鍏氬憳鍏堥攱宀�")
private Integer dangyuan;
/**
* 鍏氬憳鎵╁睍
@@ -91,30 +92,37 @@ public class WorkmanEntity extends WorkmanVo {
/**
* 鎵嬫満
*/
+ @Excel(name = "鎵嬫満")
private String mobile;
/**
* 鏄熺骇
*/
+ @Excel(name = "鏄熺骇")
private Integer starlevel;
/**
* 涓汉绠€浠�
*/
+ @Excel(name = "涓汉绠€浠�")
private String summary;
/**
* 鐓х墖
*/
+ @Excel(name = "鐓х墖",height = 90, type = Excel.Type.EXPORT, cellType = Excel.ColumnType.IMAGE)
private String photoPath;
/**
* 宀椾綅鑱岃矗
*/
+ @Excel(name = "宀椾綅鑱岃矗")
private String duty;
/**
* 鏈嶅姟鎵胯
*/
+ @Excel(name = "鏈嶅姟鎵胯")
private String promise;
/**
* 鍔炵悊浜嬮」
*/
+ @Excel(name = "鍔炵悊浜嬮」")
private String business;
/**
* 鏄惁鍦ㄧ嚎锛�0.绂荤嚎锛�1.鍦ㄧ嚎锛�2.鏆傜,3.鐐瑰嚮鏆傜,4.鍥炲綊,5.鐧婚檰锛�
diff --git a/portal-manager/db/add.sql b/portal-manager/db/add.sql
index 6b3cf2fe..12d234a0 100644
--- a/portal-manager/db/add.sql
+++ b/portal-manager/db/add.sql
@@ -94,7 +94,12 @@ CREATE TABLE `mortals_xhx_message_template` (
`create_user_id` bigint(20) DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
`create_time` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
`update_time` datetime DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
- PRIMARY KEY (`id`) USING BTREE
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE KEY `uni_code`(`code`) USING BTREE,
+ INDEX `idx_site_id`(`site_id`) USING BTREE,
+ INDEX `idx_app_name`(`app_name`) USING BTREE,
+ INDEX `idx_category`(`category`) USING BTREE
+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='娑堟伅妯℃澘琛�';
@@ -110,14 +115,18 @@ CREATE TABLE `mortals_xhx_message_task` (
`recipient` varchar(64) DEFAULT NULL COMMENT '鎺ユ敹鑰呬俊鎭紝渚嬪鎵嬫満鍙枫€侀偖绠辨垨鐢ㄦ埛 ID锛屽叿浣撴牸寮忎緷鎹ā鏉跨被鍨嬶紙SMS 涓烘墜鏈哄彿锛孍MAIL 涓洪偖绠憋紝PUSH 涓虹敤鎴� ID锛�',
`parameters` varchar(64) DEFAULT NULL COMMENT '鍔ㄦ€佸弬鏁帮紝鐢ㄤ簬鏇挎崲娑堟伅妯℃澘涓殑鍗犱綅绗︺€備緥濡傦細{"name": "寮犱笁", "code": "123456"}',
`channel` varchar(64) DEFAULT NULL COMMENT '娑堟伅鍙戦€佹笭閬擄紝渚嬪 SMS锛堢煭淇★級銆丒MAIL锛堥偖浠讹級銆丳USH锛堟帹閫侀€氱煡)',
- `priority` tinyint(2) COMMENT '娑堟伅浼樺厛绾э細LOW锛堜綆锛夈€丮EDIUM锛堜腑锛夈€丠IGH锛堥珮锛夈€傞粯璁ゅ€间负 MEDIUM锛岀敤浜庢秷鎭换鍔¤皟搴︽椂鍐冲畾浼樺厛绾�',
`priority` tinyint(2) DEFAULT '0' COMMENT '浼樺厛绾э紝鐢ㄤ簬鍦ㄦ秷鎭换鍔¤皟搴︽椂鍖哄垎閲嶈鎬� (0.鏅€氾紝1.浼樺厛锛�2.绱ф€�)',
`send_status` tinyint(2) DEFAULT '0' COMMENT '鐘舵€� (0.寰呭彂閫侊紝1.鍙戦€佷腑锛�2.鎴愬姛锛�3.澶辫触)',
`retry_count` tinyint(2) DEFAULT '0' COMMENT '浠诲姟閲嶈瘯娆℃暟锛岃褰曚换鍔″け璐ュ悗宸插皾璇曢噸鏂板彂閫佺殑娆℃暟銆傞粯璁ゅ€间负 0锛岀敤浜庨槻姝㈡棤闄愰噸璇曘€�',
`create_user_id` bigint(20) DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
`create_time` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
`update_time` datetime DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
- PRIMARY KEY (`id`) USING BTREE
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `idx_code`(`code`) USING BTREE,
+ INDEX `idx_template_id`(`template_id`) USING BTREE,
+ INDEX `idx_site_id`(`site_id`) USING BTREE,
+ INDEX `idx_app_name`(`app_name`) USING BTREE,
+ INDEX `idx_send_status`(`send_status`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='娑堟伅浠诲姟琛�';
DROP TABLE IF EXISTS `mortals_xhx_message_log`;
@@ -132,7 +141,6 @@ CREATE TABLE `mortals_xhx_message_log` (
`response` varchar(64) DEFAULT NULL COMMENT '杩斿洖鐨勫搷搴旂粨鏋滐紝璁板綍鍙戦€佺殑璇︾粏鍙嶉淇℃伅',
`error_code` varchar(64) DEFAULT NULL COMMENT '閿欒浠ｇ爜锛屾爣璇嗗叿浣撶殑澶辫触鍘熷洜銆備緥濡� "400"锛堝弬鏁伴敊璇級銆�"503"锛堟湇鍔′笉鍙敤锛�',
`error_msg` varchar(512) DEFAULT NULL COMMENT '閿欒鎻忚堪淇℃伅锛屽 error_code 杩涜琛ュ厖璇存槑銆備緥濡傦細"Invalid recipient address"',
- `priority` tinyint(2) COMMENT '娑堟伅浼樺厛绾э細LOW锛堜綆锛夈€丮EDIUM锛堜腑锛夈€丠IGH锛堥珮锛夈€傞粯璁ゅ€间负 MEDIUM锛岀敤浜庢秷鎭换鍔¤皟搴︽椂鍐冲畾浼樺厛绾�',
`priority` tinyint(2) DEFAULT '0' COMMENT '浼樺厛绾э紝鐢ㄤ簬鍦ㄦ秷鎭换鍔¤皟搴︽椂鍖哄垎閲嶈鎬� (0.鏅€氾紝1.浼樺厛锛�2.绱ф€�)',
`send_status` tinyint(2) DEFAULT '0' COMMENT '鐘舵€� (0.寰呭彂閫侊紝1.鍙戦€佷腑锛�2.鎴愬姛锛�3.澶辫触)',
`retry_count` tinyint(2) DEFAULT '0' COMMENT '浠诲姟閲嶈瘯娆℃暟锛岃褰曚换鍔″け璐ュ悗宸插皾璇曢噸鏂板彂閫佺殑娆℃暟銆傞粯璁ゅ€间负 0锛岀敤浜庨槻姝㈡棤闄愰噸璇曘€�',
@@ -140,5 +148,10 @@ CREATE TABLE `mortals_xhx_message_log` (
`create_user_id` bigint(20) DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
`create_time` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
`update_time` datetime DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
- PRIMARY KEY (`id`) USING BTREE
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `idx_task_id`(`task_id`) USING BTREE,
+ INDEX `idx_code`(`code`) USING BTREE,
+ INDEX `idx_site_id`(`site_id`) USING BTREE,
+ INDEX `idx_app_name`(`app_name`) USING BTREE,
+ INDEX `idx_send_status`(`send_status`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='娑堟伅鏃ュ織琛�';
--
2.24.3