From 5a1b431f38a13af2456590e4eb1c0225c0f03f4c Mon Sep 17 00:00:00 2001 From: yujintao Date: Fri, 13 Mar 2020 16:49:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/NumConstant.java | 12 ++-- .../tools/constant/ServiceConstant.java | 9 +++ .../epdc/commons/tools/redis/RedisKeys.java | 56 ++++++++++++++++++- .../epdc/commons/tools/utils/DateUtils.java | 5 ++ .../commons/tools/utils/LocalDateUtils.java | 51 +++++++++++++++++ 5 files changed, 128 insertions(+), 5 deletions(-) create mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/LocalDateUtils.java diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java index dc987077c..b7902105d 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java @@ -9,17 +9,21 @@ package com.elink.esua.epdc.commons.tools.constant; */ public interface NumConstant { + int TWO_NEG = -2; + int ONE_NEG = -1; int ZERO = 0; int ONE = 1; int TWO = 2; int THREE = 3; int FOUR = 4; int SIX = 6; - - int ONE_NEG = -1; - int TWO_NEG = -2; - + int SEVEN = 7; + int EIGHT = 8; + int NINE = 9; int TEN = 10; + int ELEVEN = 11; + int TWELVE = 12; + int FIFTEEN = 15; int TWENTY = 20; int THIRTY = 30; diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java index 1b06b164e..ced432c41 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java @@ -89,4 +89,13 @@ public interface ServiceConstant { * 数据分析模块 */ String EPDC_ANALYSIS_SERVER = "epdc-analysis-server"; + /** + * 积分模块 + */ + String EPDC_POINTS_SERVER = "epdc-points-server"; + + /** + * 开放接口模块 + */ + String EPDC_API_SERVER = "epdc-api-server"; } diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java index 0681bc02a..1ebb47bf5 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java @@ -141,7 +141,7 @@ public class RedisKeys { } /** - * 管理员部门层级关系 + * 管理员有数据权限的部门层级关系 * * @param userId 用户id * @return java.lang.String @@ -164,6 +164,18 @@ public class RedisKeys { return rootPrefix.concat("options:dept:user:all:").concat(String.valueOf(userId)); } + /** + * 存放部门层级关系，主要用于获取拼接后的部门id和部门名称 + * + * @param deptId + * @return java.lang.String + * @author work@yujt.net.cn + * @date 2019/12/20 20:34 + */ + public static String getDeptOptionKey(Long deptId) { + return rootPrefix.concat("options:dept:common:").concat(String.valueOf(deptId)); + } + /** * 事件分类 */ @@ -204,4 +216,46 @@ public class RedisKeys { public static String getCustomSentryPostKey(String postCode) { return rootPrefix.concat("custom:epidemic:sentryPost:").concat(postCode); } + + /** + * @Author wanggongfeng + * @Description常用语 + */ + public static String getPhraseListKey() { + return rootPrefix.concat("heart:phrase:list"); + } + + /** + * @param ruleCode 积分规则编码 + * @return java.lang.String + * @Author yinzuomei + * @Description 积分规则 + * @Date 2019/12/12 10:02 + **/ + public static String getPointsRuleKey(String ruleCode) { + return rootPrefix.concat("config:points:rule:").concat(ruleCode); + } + + /** + * 按项目分类设置项目响应/关闭时限 + * + * @param categoryId + * @return java.lang.String + * @author work@yujt.net.cn + * @date 2019/12/20 20:38 + */ + public static String getKpiItemTimeLimitKey(String categoryId) { + return rootPrefix.concat("config:kpi:itemtimelimit:").concat(categoryId); + } + + /** + * 存储议题响应/关闭时限 + * + * @return java.lang.String + * @author work@yujt.net.cn + * @date 2019/12/20 20:39 + */ + public static String getKpiIssueTimeLimitKey() { + return rootPrefix.concat("config:kpi:issuetimelimit"); + } } diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java index 3789283f4..0de5d2834 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java @@ -25,11 +25,16 @@ import java.util.Date; * @since 1.0.0 */ public class DateUtils { + /** 时间格式(yyyy-MM-dd) */ public final static String DATE_PATTERN = "yyyy-MM-dd"; + /** 时间格式(yyyy-MM-dd HH:mm:ss) */ public final static String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss"; + /** 时间格式(yyyyMMddHHmmss) */ + public final static String DATE_TIME_NO_SPLIT = "yyyyMMddHHmmss"; + /** * 日期格式化 日期格式为：yyyy-MM-dd * @param date 日期 diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/LocalDateUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/LocalDateUtils.java new file mode 100644 index 000000000..133340b24 --- /dev/null +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/LocalDateUtils.java @@ -0,0 +1,51 @@ +package com.elink.esua.epdc.commons.tools.utils; + + +import java.time.*; +import java.util.Date; + +/** + * @author work@yujt.net.cn + * @date 2019/12/13 15:05 + */ +public class LocalDateUtils { + + + public static LocalDateTime dateToLocalDateTime(Date date) { + Instant instant = date.toInstant(); + ZoneId zone = ZoneId.systemDefault(); + return LocalDateTime.ofInstant(instant, zone); + } + + public static LocalDate dateToLocalDate(Date date) { + Instant instant = date.toInstant(); + ZoneId zone = ZoneId.systemDefault(); + LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone); + return localDateTime.toLocalDate(); + } + + public static YearMonth dateToYearMonth(Date date) { + LocalDate localDate = dateToLocalDate(date); + return YearMonth.of(localDate.getYear(), localDate.getMonthValue()); + } + + public static LocalTime dateToLocalTime(Date date) { + Instant instant = date.toInstant(); + ZoneId zone = ZoneId.systemDefault(); + LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone); + return localDateTime.toLocalTime(); + } + + public static Date localDateTimeToDate(LocalDateTime localDateTime) { + ZoneId zone = ZoneId.systemDefault(); + Instant instant = localDateTime.atZone(zone).toInstant(); + return Date.from(instant); + } + + public static Date localDateToDate(LocalDate localDate) { + ZoneId zone = ZoneId.systemDefault(); + Instant instant = localDate.atStartOfDay().atZone(zone).toInstant(); + return Date.from(instant); + } + +}