diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
index e4fcc31010..616092ce1c 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
@@ -16,6 +16,7 @@ import org.joda.time.format.DateTimeFormatter;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.Calendar;
import java.util.Date;
/**
@@ -34,6 +35,13 @@ public class DateUtils {
/** 时间格式(yyyy-MM-dd HH:mm) */
public final static String DATE_TIME_PATTERN_END_WITH_MINUTE = "yyyy-MM-dd HH:mm";
+ public static final String DATE_PATTERN_YYYYMMDD = "yyyyMMdd";
+ public static final String DATE_NAME_PATTERN = "yyyy年MM月dd日";
+ public static final String DATE_PATTERN_YYYY = "yyyy";
+
+ public static final String WEEK_TYPE_ENGLISH = "english";
+ public static final String WEEK_TYPE_CHINESE = "chinese";
+
/**
* 日期格式化 日期格式为:yyyy-MM-dd
* @param date 日期
@@ -184,4 +192,53 @@ public class DateUtils {
DateTime dateTime = new DateTime(date);
return dateTime.plusYears(years).toDate();
}
+
+ /**
+ * 获取星期几,例如:星期一
+ * @param date
+ * @return
+ */
+ public static String getWeekNameOfWeek(Date date, String type) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
+ String[] chineseWeekDayName = { "星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六" };
+ String[] englishWeekDayName = { "Sunday", "Monday","Tuesday","Wednesday","Thursday","Friday","Saturday" };
+
+ String weekDayName;
+ switch (type) {
+ case WEEK_TYPE_ENGLISH:
+ weekDayName = englishWeekDayName[dayOfWeek - 1];
+ break;
+ case WEEK_TYPE_CHINESE:
+ weekDayName = chineseWeekDayName[dayOfWeek - 1];
+ break;
+ default:
+ weekDayName = "";
+ }
+
+ return weekDayName;
+ }
+
+ //public static String getEnglishWeekName(Date date) {
+ // new SimpleDateFormat("E");
+ //}
+
+ /**
+ * 获取属于一年的第几周
+ * @param date
+ * @return
+ */
+ public static int getWeekOfYear(Date date) {
+ DateTime dateTime = new DateTime(date);
+ return dateTime.getWeekOfWeekyear();
+ }
+
+ public static void main(String[] args) {
+ //int weekOfYear = getWeekOfYear(new Date());
+
+ String e = DateUtils.format(new Date(), "E");
+
+ System.out.println(e);
+ }
}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DatePatternConstant.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DatePatternConstant.java
new file mode 100644
index 0000000000..867752ebdc
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DatePatternConstant.java
@@ -0,0 +1,8 @@
+package com.epmet.constant;
+
+/**
+ * 日期格式常量
+ */
+public interface DatePatternConstant {
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml
index b89a0a789e..6d9b40adcd 100644
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-server/pom.xml
@@ -99,33 +99,33 @@
-
+
epmet_data_statistical_user
EpmEt-db-UsEr
-
+
epmet_gov_org_user
EpmEt-db-UsEr
-
+
epmet_gov_issue_user
EpmEt-db-UsEr
-
+
epmet_gov_project_user
EpmEt-db-UsEr
0
- 192.168.1.130
- 6379
+ 118.190.150.119
+ 47379
123456
false
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimDateController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimDateController.java
new file mode 100644
index 0000000000..ed44578476
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimDateController.java
@@ -0,0 +1,27 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.service.stats.DimDateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("dim")
+public class DimDateController {
+
+ @Autowired
+ private DimDateService dimDateService;
+
+ /**
+ * 初始化按日维度
+ * @return
+ */
+ @PostMapping("/date/init")
+ public Result initDim() {
+ dimDateService.initDimDate();
+ return new Result();
+ }
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimDateDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimDateDao.java
index b5716a6108..3a1436cbcc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimDateDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimDateDao.java
@@ -40,4 +40,11 @@ public interface DimDateDao extends BaseDao {
* @Description 根据创建时间查询日维度信息
**/
List selectDimDate(DimDateDTO dto);
+
+ /**
+ * 最新的按日维度
+ */
+ DimDateDTO getLatestDimDate();
+
+ int insertOne(DimDateEntity dimDateEntity);
}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimDateService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimDateService.java
index 4960ea3629..8c376e33e7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimDateService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimDateService.java
@@ -100,4 +100,7 @@ public interface DimDateService extends BaseService {
* @Description 根据创建时间查询日维度信息
**/
List getDimDate(DimDateDTO dto);
+
+ void initDimDate();
+
}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDateServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDateServiceImpl.java
index a52e25c05b..4ec6214798 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDateServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDateServiceImpl.java
@@ -23,6 +23,8 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.constant.DatePatternConstant;
import com.epmet.dao.stats.DimDateDao;
import com.epmet.dto.stats.DimDateDTO;
import com.epmet.entity.stats.DimDateEntity;
@@ -32,9 +34,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDateTime;
+import java.util.*;
/**
* 日期维度表
@@ -45,7 +46,6 @@ import java.util.Map;
@Service
public class DimDateServiceImpl extends BaseServiceImpl implements DimDateService {
-
@Override
public PageData page(Map params) {
IPage page = baseDao.selectPage(
@@ -109,4 +109,70 @@ public class DimDateServiceImpl extends BaseServiceImpl
+
+
+
+
+ INSERT INTO dim_date
+ (ID, DATE_NAME, DAY_OF_WEEK, DAY_OF_WEEK_NAME, WEEK_ID, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME)
+ VALUES
+ (#{id}, #{dateName}, #{dayOfWeek}, #{dayOfWeekName}, #{weekId}, #{delFlag}, #{revision}, #{createdBy}, #{createdTime}, #{updatedBy}, #{updatedTime})
+
\ No newline at end of file