From e84df331a8ee600d369eeac4172b750db563926d Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Sun, 09 Aug 2020 15:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java | 74 +++++++++++++++++++++++++++++++++---
1 files changed, 67 insertions(+), 7 deletions(-)
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java
index 25ca205..57954e1 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java
@@ -35,6 +35,10 @@
* 客户端IP
*/
String USER_AGENT_IP="user_agent_ip";
+ /**
+ * 客户端屏幕分辨率
+ */
+ String USER_AGENT_SYSTEM_SCREEN="user_agent_system_screen";
/**
* 标签 header key
@@ -165,7 +169,7 @@
/**
* 默认超级管理员账号
*/
- public final static String ROOT = "admin";
+ public final static String ROOT = "admin-xg";
/**
* 负载均衡策略-版本号 信息头
@@ -246,21 +250,21 @@
/**
* 生成缩略图需要的图片暂存目录
*/
-// public static final String TEMP_IMAGE_PATH="D:/resources/images/";
- public static final String TEMP_IMAGE_PATH="/root/data";
+ public static final String TEMP_IMAGE_PATH="D:/resources/images/";
+// public static final String TEMP_IMAGE_PATH="/root/kidgrow";
/**
* 普通医生角色ID
*/
public static final Long HOSPITAL_DOCTOR_ID=1268826800663289858L;
/**
- * 普通医生角色code标识
+ * 普通医生角色code标识`
*/
public static final String HOSPITAL_DOCTOR_CODE="hospital_doctor";
/**
* 管理员医生角色ID
*/
- public static final Long HOSPITAL_ADMIN_ID=9L;
+ public static final Long HOSPITAL_ADMIN_ID=1238826800663299909L;
/**
* 管理员医生角色code标识
*/
@@ -269,10 +273,66 @@
/**
* 自主注册医院的组织id
*/
- public static final Long HOSPITAL_ORG_ID=1273809987709677569L;
+ public static final Long HOSPITAL_ORG_ID=15321234570L;
/**
* 自主注册的科室组织id
*/
- public static final Long DEPARTMENT_ORG_ID=1273810374550335490L;
+ public static final Long DEPARTMENT_ORG_ID=15321234571L;
+
+ /**
+ * 自主注册的创建人id
+ */
+ public static final Long CREATE_USER_ID= 0L;
+ /**
+ * 自主注册的创建人名称
+ */
+ public static final String CREATE_USER_NAME= "自动创建";
+ /**
+ * 管理员角色code标识
+ */
+ public static final String SYSTEM_ADMIN_ROLE_CODE="admin";
+
+ /**
+ * 销售主管角色code标识
+ */
+ public static final String SALE_MANAGER_ROLE_CODE="salemanager";
+
+ /**
+ * 喜高PC高管角色code标识
+ */
+ public static final String PC_ADMIN_ROLE_CODE="pc_admin";
+ /**
+ * 喜高运营高管角色code标识
+ */
+ public static final String OPRATIONMANAGER_ROLE_CODE="oprationmanager";
+
+ /**
+ * 集团组织级别
+ */
+ public static final Integer SYSTEM_ORG_TOP_CODE=0;
+ /**
+ * 公司/医院组织级别
+ */
+ public static final Integer SYSTEM_ORG_HOS_LEVEL=1;
+ /**
+ * 科室部门组织级别
+ */
+ public static final Integer SYSTEM_ORG_DEP_LEVEL=2;
+ /**
+ * 医生类型 C+H
+ */
+ public static final Integer CH_DOCTOR_TYPE=0;
+ /**
+ * 医生类型 H
+ */
+ public static final Integer H_DOCTOR_TYPE=1;
+ /**
+ * 医生类型 C
+ */
+ public static final Integer C_DOCTOR_TYPE=2;
+ /**
+ * 一个科室能最大试用多少次
+ */
+ public static final Integer MAX_FREE_COUNT=0;
}
--
Gitblit v1.8.0