|
@@ -1,11 +1,13 @@
|
|
|
package cn.com.ty.lift.system.utils;
|
|
|
|
|
|
import cn.com.ty.lift.common.utils.PojoUtils;
|
|
|
+import cn.com.ty.lift.common.utils.ProjectUtils;
|
|
|
import cn.com.ty.lift.system.constants.CommonConstants;
|
|
|
import cn.com.ty.lift.system.homepage.dao.dto.request.PlatformCalendarRequest;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
+import java.lang.reflect.Method;
|
|
|
import java.time.Duration;
|
|
|
import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
@@ -161,23 +163,22 @@ public class CommonUtil {
|
|
|
public static Map getKeyToDataModel(List dataList, String dateAttrName) {
|
|
|
Map dayToDataModel = new HashMap();
|
|
|
if (dataList != null && dataList.size() > 0) {
|
|
|
- dayToDataModel = (Map) dataList.stream()
|
|
|
- .collect(Collectors.groupingBy(obj -> {
|
|
|
- try {
|
|
|
- Object value = obj.getClass()
|
|
|
- .getMethod(PojoUtils.attrGetMethodName(dateAttrName)).invoke(obj, null);
|
|
|
- if (value != null) {
|
|
|
- if (value instanceof LocalDate) {
|
|
|
- return getDateDayValue((LocalDate) value);
|
|
|
- }
|
|
|
- return value;
|
|
|
- }
|
|
|
- return 0;
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- return null;
|
|
|
+ dayToDataModel = (Map) dataList.stream().collect(Collectors.groupingBy(obj -> {
|
|
|
+ try {
|
|
|
+ Method method = obj.getClass().getMethod(PojoUtils.attrGetMethodName(dateAttrName));
|
|
|
+ Object value = method.invoke(obj);
|
|
|
+ if (value != null) {
|
|
|
+ if (value instanceof LocalDate) {
|
|
|
+ return getDateDayValue((LocalDate) value);
|
|
|
}
|
|
|
- }));
|
|
|
+ return value;
|
|
|
+ }
|
|
|
+ return 0;
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ }));
|
|
|
}
|
|
|
return dayToDataModel;
|
|
|
}
|