From f00afffded10b851f4782aaca63ff6cf343ba0d2 Mon Sep 17 00:00:00 2001
From: Geoffrey <Geoffrey@mail.com>
Date: 星期二, 14 一月 2025 15:45:00 +0800
Subject: [PATCH] 公共类修改
---
zhitan-common/src/main/java/com/zhitan/common/core/domain/BaseEntity.java | 6
zhitan-common/src/main/java/com/zhitan/common/constant/CommonConst.java | 1053 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
zhitan-common/src/main/java/com/zhitan/common/utils/PageUtils.java | 11
3 files changed, 1,066 insertions(+), 4 deletions(-)
diff --git a/zhitan-common/src/main/java/com/zhitan/common/constant/CommonConst.java b/zhitan-common/src/main/java/com/zhitan/common/constant/CommonConst.java
index 939d0f7..c328731 100644
--- a/zhitan-common/src/main/java/com/zhitan/common/constant/CommonConst.java
+++ b/zhitan-common/src/main/java/com/zhitan/common/constant/CommonConst.java
@@ -1,5 +1,7 @@
package com.zhitan.common.constant;
+import java.math.BigDecimal;
+
/**
* @Description: 甯搁噺灏佽
* @author: yxw
@@ -22,10 +24,7 @@
* 瀛楃涓叉暟瀛� -1
*/
public static final String STR_NUMBER_MINUS_ONE = "-1";
- /**
- * 瀛楃涓叉暟瀛� 0
- */
- public static final String STR_NUMBER_0 = "0";
+
/**
* 瀛楃涓叉暟瀛� 1
*/
@@ -107,6 +106,90 @@
*/
public static final int DIGIT_4 = 4;
/**
+ * 鏁板瓧 5
+ */
+ public static final int DIGIT_5 = 5;
+ /**
+ * 鏁板瓧 6
+ */
+ public static final int DIGIT_6 = 6;
+ /**
+ * 鏁板瓧 7
+ */
+ public static final int DIGIT_7 = 7;
+ /**
+ * 鏁板瓧 8
+ */
+ public static final int DIGIT_8 = 8;
+ /**
+ * 鏁板瓧 9
+ */
+ public static final int DIGIT_9 = 9;
+ /**
+ * 鏁板瓧 10
+ */
+ public static final int DIGIT_10 = 10;
+ /**
+ * 鏁板瓧 11
+ */
+ public static final int DIGIT_11 = 11;
+ /**
+ * 鏁板瓧 12
+ */
+ public static final int DIGIT_12 = 12;
+ /**
+ * 鏁板瓧 13
+ */
+ public static final int DIGIT_13 = 13;
+ /**
+ * 鏁板瓧 14
+ */
+ public static final int DIGIT_14 = 14;
+ /**
+ * 鏁板瓧 15
+ */
+ public static final int DIGIT_15 = 15;
+ /**
+ * 鏁板瓧 16
+ */
+ public static final int DIGIT_16 = 16;
+ /**
+ * 鏁板瓧 23
+ */
+ public static final int DIGIT_23 = 23;
+ /**
+ * 鏁板瓧 24
+ */
+ public static final int DIGIT_24 = 24;
+ /**
+ * 鏁板瓧 30
+ */
+ public static final int DIGIT_30 = 30;
+ /**
+ * 鏁板瓧 31
+ */
+ public static final int DIGIT_31 = 31;
+ /**
+ * 鏁板瓧 32
+ */
+ public static final int DIGIT_32 = 32;
+ /**
+ * 鏁板瓧 3600
+ */
+ public static final int DIGIT_3600 = 3600;
+ /**
+ * 鏁板瓧 50
+ */
+ public static final int DIGIT_50 = 50;
+ /**
+ * 鏁板瓧 59
+ */
+ public static final int DIGIT_59 = 59;
+ /**
+ * 鏁板瓧 150
+ */
+ public static final int DIGIT_150 = 150;
+ /**
* 鏁板瓧 100
*/
public static final int DIGIT_100 = 100;
@@ -122,6 +205,48 @@
* 鏁板瓧 -3
*/
public static final int DIGIT_MINUS_3 = -3;
+
+
+ /**
+ * 鏁板瓧 500
+ */
+ public static final int DIGIT_500 = 500;
+
+ /**
+ * 鏁板瓧 10000
+ */
+ public static final int DIGIT_10000 = 10000;
+ /**
+ * 鏁板瓧 100000000
+ */
+ public static final int DIGIT_100000000 = 100000000;
+ /**
+ * 鏈�灏忓�煎垵濮嬪寲
+ */
+ public static final double MIN_INIT_VALUE = -99;
+ /**
+ * DOUBLE 鏁板瓧0.0
+ */
+ public static final Double DOUBLE_ZERO = 0.0;
+
+ /**
+ * 鏁板瓧 -5
+ */
+ public static final int DIGIT_MINUS_5 = -5;
+ /**
+ * 鏁板瓧 -6
+ */
+ public static final int DIGIT_MINUS_6 = -6;
+ /**
+ * 鏁板瓧 -11
+ */
+ public static final int DIGIT_MINUS_11 = -11;
+ /**
+ * 鏁板瓧 -12
+ */
+ public static final int DIGIT_MINUS_12 = -12;
+
+
/**
* 璁＄畻鐐硅瘑鍒鍒� 绱Н閲�
*/
@@ -142,4 +267,924 @@
* 閲嶇畻鎺ュ彛鍦板潃
*/
public static final String RE_CALC_INTERFACE_ADDRESS = "http://127.0.0.1:8999/computing/recalc";
+
+
+////////////////////////////////
+
+ /**
+ * 姝ｅ父鐘舵��
+ */
+ public static final Integer STATUS_NORMAL = 0;
+
+ /**
+ * 绂佺敤鐘舵��
+ */
+ public static final Integer STATUS_DISABLE = -1;
+
+ /**
+ * 鍒犻櫎鏍囧織
+ */
+ public static final Integer DEL_FLAG_1 = 1;
+
+ /**
+ * 鏈垹闄�
+ */
+ public static final Integer DEL_FLAG_0 = 0;
+
+ /**
+ * 绯荤粺鏃ュ織绫诲瀷锛� 鐧诲綍
+ */
+ public static final int LOG_TYPE_1 = 1;
+
+ /**
+ * 绯荤粺鏃ュ織绫诲瀷锛� 鎿嶄綔
+ */
+ public static final int LOG_TYPE_2 = 2;
+
+ /**
+ * 鎿嶄綔鏃ュ織绫诲瀷锛� 鏌ヨ
+ */
+ public static final int OPERATE_TYPE_1 = 1;
+
+ /**
+ * 鎿嶄綔鏃ュ織绫诲瀷锛� 娣诲姞
+ */
+ public static final int OPERATE_TYPE_2 = 2;
+
+ /**
+ * 鎿嶄綔鏃ュ織绫诲瀷锛� 鏇存柊
+ */
+ public static final int OPERATE_TYPE_3 = 3;
+
+ /**
+ * 鎿嶄綔鏃ュ織绫诲瀷锛� 鍒犻櫎
+ */
+ public static final int OPERATE_TYPE_4 = 4;
+
+ /**
+ * 鎿嶄綔鏃ュ織绫诲瀷锛� 鍊掑叆
+ */
+ public static final int OPERATE_TYPE_5 = 5;
+
+ /**
+ * 鎿嶄綔鏃ュ織绫诲瀷锛� 瀵煎嚭
+ */
+ public static final int OPERATE_TYPE_6 = 6;
+
+ /**
+ * 鐧惧垎涔�0
+ */
+ public static final String PERCENTAGE_ZERO = "0.00%";
+
+ /**
+ * 鐧惧垎鍙�
+ */
+ public static final String PERCENTAGE_FLAG = "%";
+
+ /**
+ * 淇濈暀涓や綅灏忔暟
+ */
+ public static final String KEEP_TWO_DECIMAL = "%.2f";
+
+ /**
+ * 绉熸埛1
+ */
+ public static final int TENANT_1 = 1;
+
+
+
+
+ /**
+ * {@code 500 Server Error} (HTTP/1.0 - RFC 1945)
+ */
+ public static final Integer SC_INTERNAL_SERVER_ERROR_500 = 500;
+ /**
+ * {@code 200 OK} (HTTP/1.0 - RFC 1945)
+ */
+ public static final Integer SC_OK_200 = 200;
+
+ /**
+ * 璁块棶鏉冮檺璁よ瘉鏈�氳繃 510
+ */
+ public static final Integer SC_JEECG_NO_AUTHZ = 510;
+
+ /**
+ * 鐧诲綍鐢ㄦ埛Shiro鏉冮檺缂撳瓨KEY鍓嶇紑
+ */
+ public static String PREFIX_USER_SHIRO_CACHE = "shiro:cache:org.jeecg.config.shiro.ShiroRealm.authorizationCache:";
+ /**
+ * 鐧诲綍鐢ㄦ埛Token浠ょ墝缂撳瓨KEY鍓嶇紑
+ */
+ public static final String PREFIX_USER_TOKEN = "user:token:";
+
+ /**
+ * 鍞竴鐧诲綍鐧诲綍鐢ㄦ埛Token浠ょ墝缂撳瓨KEY鍓嶇紑
+ */
+ public static final String PREFIX_ONLY_USER_TOKEN = "only:user:token:";
+
+ /**
+ * 鍞竴鐧诲綍鐧诲綍琚绾垮悗鏍囪瘑鍓嶇紑
+ */
+ public static final String PREFIX_ONLY_USER_SINGLE_TOKEN = "prefix_only_user_single_token_";
+
+ /**
+ * 鐧诲綍鐢ㄦ埛绉熸埛redis缂撳瓨淇℃伅鍚嶇О
+ */
+ public static final String PREFIX_TENANT_INFO_NAME = "sys:tenant:name:";
+
+ /**
+ * Token缂撳瓨鏃堕棿锛�3600绉掑嵆涓�灏忔椂
+ */
+ public static final int TOKEN_EXPIRE_TIME = 3600;
+
+
+ /**
+ * 0锛氫竴绾ц彍鍗�
+ */
+ public static final Integer MENU_TYPE_0 = 0;
+ /**
+ * 1锛氬瓙鑿滃崟
+ */
+ public static final Integer MENU_TYPE_1 = 1;
+ /**
+ * 2锛氭寜閽潈闄�
+ */
+ public static final Integer MENU_TYPE_2 = 2;
+
+ /**
+ * 閫氬憡瀵硅薄绫诲瀷锛圲SER:鎸囧畾鐢ㄦ埛锛孉LL:鍏ㄤ綋鐢ㄦ埛锛�
+ */
+ public static final String MSG_TYPE_UESR = "USER";
+ public static final String MSG_TYPE_ALL = "ALL";
+
+ /**
+ * 鍙戝竷鐘舵�侊紙0鏈彂甯冿紝1宸插彂甯冿紝2宸叉挙閿�锛�
+ */
+ public static final String NO_SEND = "0";
+ public static final String HAS_SEND = "1";
+ public static final String HAS_CANCLE = "2";
+
+ /**
+ * 闃呰鐘舵�侊紙0鏈锛�1宸茶锛�
+ */
+ public static final String HAS_READ_FLAG = "1";
+ public static final String NO_READ_FLAG = "0";
+
+ /**
+ * 浼樺厛绾э紙L浣庯紝M涓紝H楂橈級
+ */
+ public static final String PRIORITY_L = "L";
+ public static final String PRIORITY_M = "M";
+ public static final String PRIORITY_H = "H";
+
+ /**
+ * 鐭俊妯℃澘鏂瑰紡 0 .鐧诲綍妯℃澘銆�1.娉ㄥ唽妯℃澘銆�2.蹇樿瀵嗙爜妯℃澘
+ */
+ public static final String SMS_TPL_TYPE_0 = "0";
+ public static final String SMS_TPL_TYPE_1 = "1";
+ public static final String SMS_TPL_TYPE_2 = "2";
+
+ /**
+ * 鐘舵��(0鏃犳晥1鏈夋晥)
+ */
+ public static final String STATUS_0 = "0";
+ public static final String STATUS_1 = "1";
+
+ /**
+ * 鍚屾宸ヤ綔娴佸紩鎿�1鍚屾0涓嶅悓姝�
+ */
+ public static final Integer ACT_SYNC_1 = 1;
+ public static final Integer ACT_SYNC_0 = 0;
+
+ /**
+ * 娑堟伅绫诲瀷1:閫氱煡鍏憡2:绯荤粺娑堟伅
+ */
+ public static final String MSG_CATEGORY_1 = "1";
+ public static final String MSG_CATEGORY_2 = "2";
+
+ /**
+ * 鏄惁閰嶇疆鑿滃崟鐨勬暟鎹潈闄� 1鏄�0鍚�
+ */
+ public static final Integer RULE_FLAG_0 = 0;
+ public static final Integer RULE_FLAG_1 = 1;
+
+ /**
+ * 鏄惁鐢ㄦ埛宸茶鍐荤粨 1姝ｅ父(瑙ｅ喕) 2鍐荤粨
+ */
+ public static final Integer USER_UNFREEZE = 1;
+ public static final Integer USER_FREEZE = 2;
+
+ /**
+ * 瀛楀吀缈昏瘧鏂囨湰鍚庣紑
+ */
+ public static final String DICT_TEXT_SUFFIX = "_dictText";
+
+ /**
+ * 琛ㄥ崟璁捐鍣ㄤ富琛ㄧ被鍨�
+ */
+ public static final Integer DESIGN_FORM_TYPE_MAIN = 1;
+
+ /**
+ * 琛ㄥ崟璁捐鍣ㄥ瓙琛ㄨ〃绫诲瀷
+ */
+ public static final Integer DESIGN_FORM_TYPE_SUB = 2;
+
+ /**
+ * 琛ㄥ崟璁捐鍣║RL鎺堟潈閫氳繃
+ */
+ public static final Integer DESIGN_FORM_URL_STATUS_PASSED = 1;
+
+ /**
+ * 琛ㄥ崟璁捐鍣║RL鎺堟潈鏈�氳繃
+ */
+ public static final Integer DESIGN_FORM_URL_STATUS_NOT_PASSED = 2;
+
+ /**
+ * 琛ㄥ崟璁捐鍣ㄦ柊澧� Flag
+ */
+ public static final String DESIGN_FORM_URL_TYPE_ADD = "add";
+ /**
+ * 琛ㄥ崟璁捐鍣ㄤ慨鏀� Flag
+ */
+ public static final String DESIGN_FORM_URL_TYPE_EDIT = "edit";
+ /**
+ * 琛ㄥ崟璁捐鍣ㄨ鎯� Flag
+ */
+ public static final String DESIGN_FORM_URL_TYPE_DETAIL = "detail";
+ /**
+ * 琛ㄥ崟璁捐鍣ㄥ鐢ㄦ暟鎹� Flag
+ */
+ public static final String DESIGN_FORM_URL_TYPE_REUSE = "reuse";
+ /**
+ * 琛ㄥ崟璁捐鍣ㄧ紪杈� Flag 锛堝凡寮冪敤锛�
+ */
+ public static final String DESIGN_FORM_URL_TYPE_VIEW = "view";
+
+ /**
+ * online鍙傛暟鍊艰缃紙鏄細Y, 鍚︼細N锛�
+ */
+ public static final String ONLINE_PARAM_VAL_IS_TURE = "Y";
+ public static final String ONLINE_PARAM_VAL_IS_FALSE = "N";
+
+ /**
+ * 鏂囦欢涓婁紶绫诲瀷锛堟湰鍦帮細local锛孧inio锛歮inio锛岄樋閲屼簯锛歛lioss锛�
+ */
+ public static final String UPLOAD_TYPE_LOCAL = "local";
+ public static final String UPLOAD_TYPE_MINIO = "minio";
+ public static final String UPLOAD_TYPE_OSS = "alioss";
+
+ /**
+ * 鏂囨。涓婁紶鑷畾涔夋《鍚嶇О
+ */
+ public static final String UPLOAD_CUSTOM_BUCKET = "eoafile";
+ /**
+ * 鏂囨。涓婁紶鑷畾涔夎矾寰�
+ */
+ public static final String UPLOAD_CUSTOM_PATH = "eoafile";
+ /**
+ * 鏂囦欢澶栭摼鎺ユ湁鏁堝ぉ鏁�
+ */
+ public static final Integer UPLOAD_EFFECTIVE_DAYS = 1;
+
+ /**
+ * 鍛樺伐韬唤 锛�1:鏅�氬憳宸� 2:涓婄骇锛�
+ */
+ public static final Integer USER_IDENTITY_1 = 1;
+ public static final Integer USER_IDENTITY_2 = 2;
+
+ /**
+ * sys_user 琛� username 鍞竴閿储寮�
+ */
+ public static final String SQL_INDEX_UNIQ_SYS_USER_USERNAME = "uniq_sys_user_username";
+ /**
+ * sys_user 琛� work_no 鍞竴閿储寮�
+ */
+ public static final String SQL_INDEX_UNIQ_SYS_USER_WORK_NO = "uniq_sys_user_work_no";
+ /**
+ * sys_user 琛� phone 鍞竴閿储寮�
+ */
+ public static final String SQL_INDEX_UNIQ_SYS_USER_PHONE = "uniq_sys_user_phone";
+ /**
+ * sys_user 琛� email 鍞竴閿储寮�
+ */
+ public static final String SQL_INDEX_UNIQ_SYS_USER_EMAIL = "uniq_sys_user_email";
+ /**
+ * sys_quartz_job 琛� job_class_name 鍞竴閿储寮�
+ */
+ public static final String SQL_INDEX_UNIQ_JOB_CLASS_NAME = "uniq_job_class_name";
+ /**
+ * sys_position 琛� code 鍞竴閿储寮�
+ */
+ public static final String SQL_INDEX_UNIQ_CODE = "uniq_code";
+ /**
+ * sys_role 琛� code 鍞竴閿储寮�
+ */
+ public static final String SQL_INDEX_UNIQ_SYS_ROLE_CODE = "uniq_sys_role_role_code";
+ /**
+ * sys_depart 琛� code 鍞竴閿储寮�
+ */
+ public static final String SQL_INDEX_UNIQ_DEPART_ORG_CODE = "uniq_depart_org_code";
+ /**
+ * 鍦ㄧ嚎鑱婂ぉ 鏄惁涓洪粯璁ゅ垎缁�
+ */
+ public static final String IM_DEFAULT_GROUP = "1";
+ /**
+ * 鍦ㄧ嚎鑱婂ぉ 鍥剧墖鏂囦欢淇濆瓨璺緞
+ */
+ public static final String IM_UPLOAD_CUSTOM_PATH = "imfile";
+ /**
+ * 鍦ㄧ嚎鑱婂ぉ 鐢ㄦ埛鐘舵��
+ */
+ public static final String IM_STATUS_ONLINE = "online";
+
+ /**
+ * 鍦ㄧ嚎鑱婂ぉ SOCKET娑堟伅绫诲瀷
+ */
+ public static final String IM_SOCKET_TYPE = "chatMessage";
+
+ /**
+ * 鍦ㄧ嚎鑱婂ぉ 鏄惁寮�鍚粯璁ゆ坊鍔犲ソ鍙� 1鏄� 0鍚�
+ */
+ public static final String IM_DEFAULT_ADD_FRIEND = "1";
+
+ /**
+ * 鍦ㄧ嚎鑱婂ぉ 鐢ㄦ埛濂藉弸缂撳瓨鍓嶇紑
+ */
+ public static final String IM_PREFIX_USER_FRIEND_CACHE = "sys:cache:im:im_prefix_user_friend_";
+
+ /**
+ * 鑰冨嫟琛ュ崱涓氬姟鐘舵�� 锛�1锛氬悓鎰� 2锛氫笉鍚屾剰锛�
+ */
+ public static final String SIGN_PATCH_BIZ_STATUS_1 = "1";
+ public static final String SIGN_PATCH_BIZ_STATUS_2 = "2";
+
+ /**
+ * 鍏枃鏂囨。涓婁紶鑷畾涔夎矾寰�
+ */
+ public static final String UPLOAD_CUSTOM_PATH_OFFICIAL = "officialdoc";
+ /**
+ * 鍏枃鏂囨。涓嬭浇鑷畾涔夎矾寰�
+ */
+ public static final String DOWNLOAD_CUSTOM_PATH_OFFICIAL = "officaldown";
+
+ /**
+ * WPS瀛樺偍鍊肩被鍒�(1 code鏂囧彿 2 text锛圵PS妯℃澘杩樻槸鍏枃鍙戞枃妯℃澘锛�)
+ */
+ public static final String WPS_TYPE_1 = "1";
+ public static final String WPS_TYPE_2 = "2";
+
+
+ public final static String X_ACCESS_TOKEN = "X-Access-Token";
+ public final static String X_SIGN = "X-Sign";
+ public final static String X_TIMESTAMP = "X-TIMESTAMP";
+ public final static String TOKEN_IS_INVALID_MSG = "Token澶辨晥锛岃閲嶆柊鐧诲綍!";
+ public final static String TOKEN_IS_SINGLE_MSG = "鎮ㄥ凡缁忓湪鍏朵粬鍦版柟鐧诲綍!";
+
+ /**
+ * 澶氱鎴� 璇锋眰澶�
+ */
+ public final static String TENANT_ID = "tenant-id";
+
+ /**
+ * 寰湇鍔¤鍙栭厤缃枃浠跺睘鎬� 鏈嶅姟鍦板潃
+ */
+ public final static String CLOUD_SERVER_KEY = "spring.cloud.nacos.discovery.server-addr";
+
+ /**
+ * 绯荤粺閫氬憡娑堟伅鐘舵�侊細0=鏈彂甯�
+ */
+ public static final String ANNOUNCEMENT_SEND_STATUS_0 = "0";
+ /**
+ * 绯荤粺閫氬憡娑堟伅鐘舵�侊細1=宸插彂甯�
+ */
+ public static final String ANNOUNCEMENT_SEND_STATUS_1 = "1";
+ /**
+ * 绯荤粺閫氬憡娑堟伅鐘舵�侊細2=宸叉挙閿�
+ */
+ public static final String ANNOUNCEMENT_SEND_STATUS_2 = "2";
+
+ /**
+ * 鏁呴殰鎶ヨ璁剧疆鐐逛綅妯℃嫙閲�
+ */
+ public static final String SEN_ALARM_CONF_VAL_TYPE_ANALOG = "analogQuantity";
+
+ /**
+ * 鏁呴殰鎶ヨ璁剧疆鐐逛綅鐘舵�侀噺
+ */
+ public static final String SEN_ALARM_CONF_VAL_TYPE_STATE = "stateQuantity";
+
+ public static final String WHERE = "WHERE";
+ public static final String ADMIN = "admin";
+ public static final String ADMIN_NAME = "绠＄悊鍛�";
+ public static final String LOCAL_IP = "127.0.0.1";
+
+ /**
+ * 甯搁噺瀛楃涓� 绌烘牸
+ */
+ public static final String SPACE = " ";
+ /**
+ * 甯搁噺瀛楃涓� 閫楀彿
+ */
+ public static final String STR_COMMA = ",";
+ /**
+ * 涓嬪垝绾�
+ */
+ public static final String STR_UNDERLINE = "_";
+ /**
+ * 甯搁噺瀛楃涓� 涓枃閫楀彿
+ */
+ public static final String CHINESE_STR_COMMA = "锛�";
+
+ /**
+ * 鍗曞噺鍙� -
+ */
+ public static final String SINGLE_MINUS_SIGN = "-";
+ /**
+ * 鏂滅嚎 /
+ */
+ public static final String STR_SLASH = "/";
+ /**
+ * 鍔犲彿 +
+ */
+ public static final String STR_PLUS = "+";
+ /**
+ * 鍥涜垗浜斿叆
+ */
+ public static final String STR_ROUNDING = "%.2f";
+ /**
+ * 瀛楃涓叉暟瀛� 0
+ */
+ public static final String STR_NUMBER_0 = "0";
+ /**
+ * 瀛楃涓叉暟瀛� 0.00
+ */
+ public static final String STR_NUMBER_0_00 = "0.00";
+ /**
+ * 瀛楃涓叉暟瀛� 0.0000
+ */
+ public static final String STR_NUMBER_0_0000 = "0.0000";
+ /**
+ * 瀛楃涓叉暟瀛� 100%
+ */
+ public static final String STR_NUMBER_100 = "100%";
+ /**
+ * 瀛楃涓叉暟瀛� 0%
+ */
+ public static final String STR_NUMBER_PERCENTAGE_0 = "0%";
+ /**
+ * 瀛楃涓叉暟瀛� 100.00%
+ */
+ public static final String STR_NUMBER_PERCENTAGE_100 = "100.00%";
+
+ /**
+ * 澶у啓瀛楁瘝 H
+ */
+ public static final String WORD_H = "H";
+ /**
+ * 瀛楁瘝 LJL
+ */
+ public static final String WORD_LJL = "LJL";
+
+ /**
+ * 灏忔暟0
+ */
+ public static final double DIGIT_DOUBLE_0 = 0D;
+ /**
+ * 灏忔暟0
+ */
+ public static final double DIGIT_DOUBLE_00 = 0.00D;
+ /**
+ * 灏忔暟1
+ */
+ public static final double DIGIT_DOUBLE_1 = 1.0D;
+ /**
+ * 灏忔暟100
+ */
+ public static final double DIGIT_DOUBLE_100 = 100D;
+
+ /**
+ * 鏃堕棿闂撮殧15鍒嗛挓
+ */
+ public static final int TIME_SPAN_MINUTES_15 = 1000 * 60 * 15;
+ /**
+ * 鏃堕棿闂撮殧60鍒嗛挓
+ */
+ public static final int TIME_SPAN_MINUTES_60 = 1000 * 60 * 60;
+
+
+
+ /**
+ * 姣忓勾鐨勬湀鏁�
+ */
+ public static final int MONTHS_OF_YEAR = 12;
+ /**
+ * 姣忔湀鐨勫ぉ鏁�
+ */
+ public static final int DAYS_OF_MONTH = 31;
+ /**
+ * 姣忓ぉ鐨勫皬鏃舵暟
+ */
+ public static final int HOURS_OF_DAY = 24;
+ /**
+ * 姣忓皬鏃剁殑鍒嗛挓鏁�
+ */
+ public static final int MINUTES_OF_HOUR = 60;
+ /**
+ * 姣忓垎閽熺殑绉掓暟
+ */
+ public static final int SECOND_OF_MINUTES = 60;
+ /**
+ * 涓�涓偣浣嶄竴灏忔椂鐨勬暟鎹噺
+ */
+ public static final int DATA_AMOUNT_ONE_POINT_ONE_HOUR = 4;
+
+ /**
+ * 璁＄畻鐐硅瘑鍒鍒� 绱Н閲�,sql鏌ヨ浣跨敤
+ */
+ public static final String COMMON_STR_CALC_POINT_RULE_LJL_SQL = "\\_LJL";
+
+ /**
+ * 鏁版嵁搴撴煡璇㈢患鍚堣兘鑰楀悗缂�
+ */
+ public static final String COMMON_STR_CALC_POINT_RULE_ZHNH_SQL = "\\_ZHNH";
+
+ /**
+ * 灏栧嘲骞宠胺鐢熸晥閰嶇疆
+ */
+ public static final String COMMON_JFPG_NOW_CONFIGURE = "NOW";
+ /**
+ * 灏栧嘲骞宠胺寰呯敓鏁堥厤缃�
+ */
+ public static final String COMMON_JFPG_NEXT_CONFIGURE = "NEXT";
+ /***
+ * 浜烘皯甯佸崟浣�
+ */
+ public static final String MONEY_UNIT_RMB = "鍏�";
+ /**
+ * 鍚堣琛屾暟鎹悕
+ */
+ public static final String TABLE_ROW_NAME_SUM = "鍚堣";
+ /**
+ * 鏄剧ず瀛楃涓� - 璐圭敤
+ */
+ public static final String STRING_SHOW_COST = "璐圭敤";
+ /**
+ * 鏄剧ず瀛楃涓� - 璐�
+ */
+ public static final String STRING_SHOW_COST_CHARGE = "璐�";
+ /**
+ * 鏄剧ず瀛楃涓� - 鐢�
+ */
+ public static final String STRING_SHOW_USE = "鐢�";
+ /**
+ * 鏄剧ず瀛楃涓� - 閲�
+ */
+ public static final String STRING_SHOW_CONSUMPTION = "閲�";
+ /**
+ * 鍥哄畾鍒楀悕 proportionTotal
+ */
+ public static final String ENERGY_CONSUME_PROP_NAME_PROPORTION_TOTAL = "proportionTotal";
+ /**
+ * 鍥哄畾鍒楀悕 consumeTotal
+ */
+ public static final String ENERGY_CONSUME_PROP_NAME_CONSUME_TOTAL = "consumeTotal";
+ /**
+ * 鑳芥簮鍗曚綅
+ */
+ public static final String ENERGY_CONSUME_PROP_NAME_CONSUME_UNIT = "consumeUnit";
+ /**
+ * 鍥哄畾鍒楀悕 energyTotal
+ */
+ public static final String ENERGY_CONSUME_PROP_NAME_ENERGY_TOTAL = "energyTotal";
+ /**
+ * 鍥哄畾鍒楀悕 costTotal
+ */
+ public static final String ENERGY_CONSUME_PROP_NAME_COST_TOTAL = "costTotal";
+ /**
+ * 娑堣�楅噺鍗曚綅
+ */
+ public static final String ENERGY_CONSUME_PROP_NAME_ENERGY_UNIT = "energyUnit";
+ /**
+ * 鎬绘湁鍔熷姛鐜囩偣浣嶆ā鏉縞ode
+ */
+ public static final String TAG_CODE_ZYGGL = "\\_ActivePower_Total";
+ /**
+ * 鎬绘湁鍔熷姛鐜囩偣浣嶆ā鏉縞ode
+ */
+ public static final String TAG_CODE_ZYGGL_IN_CODE = "_ActivePower_Total";
+ /**
+ * 鏈夊姛鍔熺巼Code
+ */
+ public static final String TAG_CODE_ZYGGL_PART = "\\_ActivePower";
+ /**
+ * 鎬绘棤鍔熷姛鐜囩偣浣嶆ā鏉縞ode
+ */
+ public static final String TAG_CODE_ZWGGL = "ReactivePower_Total";
+ /**
+ * 鏃犲姛鍔熺巼Code
+ */
+ public static final String TAG_CODE_ZWGGL_PART = "ReactivePower";
+ /**
+ * 鎬诲姛鐜囧洜鏁� 鐐逛綅妯℃澘code
+ */
+ public static final String TAG_CODE_GLYS = "PowerFactor_Total";
+ /**
+ * 鐢垫祦
+ */
+ public static final String TAG_CODE_CURRENT = "Current_";
+ /**
+ * 鐢靛帇
+ */
+ public static final String TAG_CODE_VOLTAGE = "Voltage_";
+ /**
+ * 鍔熺巼鍥犳暟
+ */
+ public static final String TAG_CODE_FACTOR = "PowerFactor_";
+ /**
+ * 鍔熺巼鍥犳暟
+ */
+ public static final String TAG_CODE_FACTOR_PART = "PowerFactor";
+ /**
+ * A鐩�
+ */
+ public static final String A_PHASE = "A";
+ /**
+ * B鐩�
+ */
+ public static final String B_PHASE = "B";
+ /**
+ * C鐩�
+ */
+ public static final String C_PHASE = "C";
+ /**
+ * 鑳芥簮璁＄畻绫诲瀷(閲囬泦鐐�)
+ */
+ public static final String ENERGY_INDEX_TYPE_COLLECT = "COLLECT";
+ /**
+ * 鑳芥簮绫诲瀷(璁＄畻鐐�)
+ */
+ public static final String ENERGY_INDEX_TYPE_CALCULATE = "CALCULATE";
+ /**
+ * 鎬�
+ */
+ public static final String TOTAL = "Total";
+ /**
+ * name
+ */
+ public static final String STR_NAME = "name";
+ /**
+ * A鐩哥數娴�
+ */
+ public static final String TAG_CODE_CURRENT_A = "Current_A";
+ /**
+ * B鐩哥數娴�
+ */
+ public static final String TAG_CODE_CURRENT_B = "Current_B";
+ /**
+ * C鐩哥數娴�
+ */
+ public static final String TAG_CODE_CURRENT_C = "Current_C";
+ /**
+ * A鐩哥數鍘�
+ */
+ public static final String TAG_CODE_VOLTAGE_A = "Voltage_A";
+ /**
+ * B鐩哥數鍘�
+ */
+ public static final String TAG_CODE_VOLTAGE_B = "Voltage_B";
+ /**
+ * C鐩哥數鍘�
+ */
+ public static final String TAG_CODE_VOLTAGE_C = "Voltage_C";
+ /**
+ * A鐩稿姛鐜囧洜鏁�
+ */
+ public static final String TAG_CODE_FACTOR_A = "PowerFactor_A_Total";
+ /**
+ * B鐩稿姛鐜囧洜鏁�
+ */
+ public static final String TAG_CODE_FACTOR_B = "PowerFactor_B_Total";
+ /**
+ * C鐩稿姛鐜囧洜鏁�
+ */
+ public static final String TAG_CODE_FACTOR_C = "PowerFactor_C_Total";
+ /**
+ * 鎬诲姛鐜囧洜鏁�
+ */
+ public static final String TAG_CODE_FACTOR_TOTAL = "PowerFactor_Total";
+ /**
+ * 鐢靛姏璐熻嵎鍗曚綅
+ */
+ public static final String ELECTRIC_LOAD_UNIT = "(kW)";
+ /**
+ * 鐢靛姏璐熻嵎鍗曚綅
+ */
+ public static final String ELECTRIC_LOAD_UNIT_SHOW = "kW";
+ /**
+ * 鐢垫祦鍗曚綅 A
+ */
+ public static final String ELECTRICITY_CURRENT_UNIT_A = "A";
+ /**
+ * 鐢靛帇鍗曚綅 V
+ */
+ public static final String ELECTRICITY_VOLTAGE_UNIT_V = "V";
+ /**
+ * 绗﹀彿 - 鐧惧垎鍙�
+ */
+ public static final String SYMBOL_PERCENT = "%";
+ /**
+ * 鐢ㄦ按閲忋�佸ぉ鐒舵皵閲忋�佽捀姹介噺鍗曚綅
+ */
+ public static final String CUBIC_METER = "m鲁";
+ /**
+ * 鐢ㄧ數閲忓崟浣�
+ */
+ public static final String ELECTRICITY_CONSUMPTION = "kWh";
+ /**
+ * 缁煎悎鑳借�楀崟浣�
+ */
+ public static final String ENERGY_CONSUME = "tce";
+ /**
+ * 鏃堕棿鏄剧ず瀛楃鍚庣紑
+ */
+ public static final String TIME_UNIT_SHOW_HOUR = "鏃�";
+ /**
+ * 灞炴�у瓧娈靛悕绉� value
+ */
+ public static final String PROP_NAME_VALUE = "value";
+ /**
+ * 灞炴�у瓧娈靛悕绉� cost
+ */
+ public static final String PROP_NAME_COST = "cost";
+ /**
+ * 灏�
+ */
+ public static final String TIP = "tip";
+ /**
+ * 宄�
+ */
+ public static final String PEAK = "peak";
+ /**
+ * 骞�
+ */
+ public static final String FLAT = "flat";
+ /**
+ * 璋�
+ */
+ public static final String TROUGH = "trough";
+ /**
+ * 鍗犳瘮
+ **/
+ public static final String ENERGY_ENTRY_PROPORTION = "proportion";
+ /**
+ * 鎬绘暟
+ **/
+ public static final String ENERGY_ENTRY_TOTAL = "total";
+ /**
+ * 璁＄畻娑堣�楃殑鍏紡
+ **/
+ public static final String FEL_ENERGY_ENTRY_CONSUMPTION_CALC = "total*proportion";
+ /**
+ * 鏍囧噯鏃堕棿
+ **/
+ public static final String STANDARD_TIME = "GMT+8";
+
+ /**
+ * 瀛楃涓睴K
+ */
+ public static final String STR_OK = "ok";
+
+ /**
+ * 琛ュ厖浣嶆暟0
+ */
+ public static final String COMPLEMENTARY_DIGIT_0 = "%02d";
+
+
+ /**
+ * 鐢靛帇绛夌骇
+ */
+ public static final String GENERAL_STR_DYDJ = "鐢靛帇绛夌骇";
+ /**
+ * 鐢靛帇绛夌骇鍗曚綅
+ */
+ public static final String GENERAL_STR_DYDJ_UNIT = "kV";
+ /**
+ * 鍙樺帇鍣ㄥ彴鏁�
+ */
+ public static final String GENERAL_STR_BYQTS = "鍙樺帇鍣ㄥ彴鏁�";
+ /**
+ * 鍙樺帇鍣ㄥ彴鏁板崟浣�
+ */
+ public static final String GENERAL_STR_BYQTS_UNIT = "鍙�";
+ /**
+ * 瑁呮満瀹归噺
+ */
+ public static final String GENERAL_STR_ZJRL = "瑁呮満瀹归噺";
+ /**
+ * 瑁呮満瀹归噺鍗曚綅
+ */
+ public static final String GENERAL_STR_ZJRL_UNIT = "kVA";
+ /**
+ * 杩愯瀹归噺
+ */
+ public static final String GENERAL_STR_YXRL = "杩愯瀹归噺";
+ /**
+ * 鏈夊姛鍔熺巼
+ */
+ public static final String GENERAL_STR_YGGL = "鏈夊姛鍔熺巼";
+ /**
+ * 鏃犲姛鍔熺巼
+ */
+ public static final String GENERAL_STR_WGGL = "鏃犲姛鍔熺巼";
+ /**
+ * 鏃犲姛鍔熺巼鍗曚綅
+ */
+ public static final String GENERAL_STR_WGGL_UNIT = "kvar";
+ /**
+ * 鑳芥簮瀵规瘮-鍚屾瘮
+ */
+ public static final String ENERGY_COMPARISON_YOY = "YOY";
+ /**
+ * 鑳芥簮瀵规瘮-鐜瘮
+ */
+ public static final String ENERGY_COMPARISON_MOM = "MOM";
+ /**
+ * 鍚姩
+ */
+ public static final String START = "鍚姩";
+ /**
+ * 鍋滄
+ */
+ public static final String STOP = "鍋滄";
+
+ /***
+ * 鍗曚綅-浜垮崈鐡︽椂
+ */
+ public static final String UNIT_TWH = "浜� Kwh";
+
+ /***
+ * 鍗曚綅-涓囧崈鐡︽椂
+ */
+ public static final String UNIT_MILLION_KWH = "涓� Kwh";
+
+ /***
+ * 鍗曚綅-鍚�
+ */
+ public static final String UNIT_TONS = "鍚�";
+
+ /***
+ * 鍗曚綅-瀛楁瘝-鍚�
+ */
+ public static final String UNIT_LETTERS_TONS = "t";
+ /***
+ * 鍗曚綅杞崲-鐧�-100
+ */
+ public static final BigDecimal UNIT_CONVERSION_100 = new BigDecimal(DIGIT_100);
+
+ /***
+ * 鍗曚綅杞崲-鍚�-1000
+ */
+ public static final BigDecimal UNIT_CONVERSION_1000 = new BigDecimal(DIGIT_1000);
+
+ /***
+ * 鍗曚綅杞崲-涓�-10000
+ */
+ public static final BigDecimal UNIT_CONVERSION_10000 = new BigDecimal(DIGIT_10000);
+
+ /***
+ * 鍗曚綅杞崲-浜�-100000000
+ */
+ public static final BigDecimal UNIT_CONVERSION_100000000 = new BigDecimal(DIGIT_100000000);
+
+ /**
+ * 瀛楀吀-纰虫帓鏀剧郴鏁�
+ */
+ public static final String DICT_CARBON_COEFFICIENT = "carbon_emission_coefficient";
+
+ /**
+ * WEIGHTY
+ */
+ public static final String WEIGHTY = "WEIGHTY";
+
+ /**
+ * 鍘�
+ */
+ public static final String ENERGY_UNIT_TYPE_FACTORY = "FACTORY";
+
+ /**
+ * 杞﹂棿
+ */
+ public static final String ENERGY_UNIT_TYPE_WORKPLACE = "WORKPLACE";
+
+ /**
+ * 宸ュ簭
+ */
+ public static final String ENERGY_UNIT_TYPE_PROCESS = "PROCESS";
+
+ /**
+ * 璁惧
+ */
+ public static final String ENERGY_UNIT_TYPE_DEVICE = "DEVICE";
+
+
}
diff --git a/zhitan-common/src/main/java/com/zhitan/common/core/domain/BaseEntity.java b/zhitan-common/src/main/java/com/zhitan/common/core/domain/BaseEntity.java
index 746f4c9..14ede4d 100644
--- a/zhitan-common/src/main/java/com/zhitan/common/core/domain/BaseEntity.java
+++ b/zhitan-common/src/main/java/com/zhitan/common/core/domain/BaseEntity.java
@@ -1,5 +1,6 @@
package com.zhitan.common.core.domain;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -26,20 +27,25 @@
private String searchValue;
/** 鍒涘缓鑰� */
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/** 鍒涘缓鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT)
private Date createTime;
/** 鏇存柊鑰� */
+ @TableField(fill = FieldFill.UPDATE)
private String updateBy;
/** 鏇存柊鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.UPDATE)
private Date updateTime;
/** 澶囨敞 */
+ @TableField(exist = false)
private String remark;
/** 鏁版嵁鏉冮檺 */
diff --git a/zhitan-common/src/main/java/com/zhitan/common/utils/PageUtils.java b/zhitan-common/src/main/java/com/zhitan/common/utils/PageUtils.java
index 00d7bff..db41aec 100644
--- a/zhitan-common/src/main/java/com/zhitan/common/utils/PageUtils.java
+++ b/zhitan-common/src/main/java/com/zhitan/common/utils/PageUtils.java
@@ -41,4 +41,15 @@
return new Page(pageNum,pageSize);
}
+
+ public static <T> Page<T> getPageInfo() {
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ return new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
+ }
+
+ public static <R> Page<R> getPageInfo(Class<R> R) {
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ return new Page<R>(pageDomain.getPageNum(), pageDomain.getPageSize());
+ }
+
}
--
Gitblit v1.9.3