From e6bd6eb3d5a03a78f707bef1e5f11da65b4526e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Thu, 26 Mar 2020 10:15:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=BC=80=E9=80=9A=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/commons/tools/utils/DateUtils.java | 26 +++++++++++++++++++ .../epdc/dto/user/MetaUserGridOpiningDTO.java | 26 +++++++++---------- .../entity/MetaUserGridOpiningEntity.java | 2 +- .../impl/MetaUserGridOpiningServiceImpl.java | 16 +++++++----- 4 files changed, 49 insertions(+), 21 deletions(-) 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 0de5d2834..bff6daf43 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 @@ -14,9 +14,11 @@ import org.joda.time.LocalDate; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; +import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Locale; /** * 日期处理工具类 @@ -185,4 +187,28 @@ public class DateUtils { DateTime dateTime = new DateTime(date); return dateTime.plusYears(years).toDate(); } + + /*** + * 前端上传信息解析 + * @param oldDate + * @return java.lang.String + * @author qushutong + * @date 2020/3/26 10:09 + */ + public static String dealDateFormat(String oldDate) { + Date date1 = null; + DateFormat df2 = null; + try { + oldDate= oldDate.replace("Z", " UTC"); + DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS Z"); + Date date = df.parse(oldDate); + SimpleDateFormat df1 = new SimpleDateFormat ("EEE MMM dd HH:mm:ss Z yyyy", Locale.UK); + date1 = df1.parse(date.toString()); + df2 = new SimpleDateFormat("yyyy-MM-dd"); + } catch (ParseException e) { + e.printStackTrace(); + } + return df2.format(date1); + } + } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java index 7bf3ea654..04b6e468d 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java @@ -41,67 +41,67 @@ public class MetaUserGridOpiningDTO implements Serializable { /** * 网格id */ - private Long gridId; + private String gridId; /** * 用户总数 */ - private String registerCount; + private int registerCount; /** * 党员数 */ - private String partyCount; + private int partyCount; /** * 已注册居民 */ - private String residentCount; + private int residentCount; /** * 未注册居民 */ - private String unAuthorizedCount; + private int unAuthorizedCount; /** * 新闻发布数 */ - private String newsCount; + private int newsCount; /** * 社群数 */ - private String communityCount; + private int communityCount; /** * 群成员数 */ - private String communityMemberCount; + private int communityMemberCount; /** * 群话题数 */ - private String communityTopicCount; + private int communityTopicCount; /** * 议题总数 */ - private String eventCount; + private int eventCount; /** * 项目数 */ - private String itemCount; + private int itemCount; /** * 项目已解决数 */ - private String itemCloseCount; + private int itemCloseCount; /** * 好评数 */ - private String itemPraiseCount; + private int itemPraiseCount; /** * 网格名称 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java index fc3d5a41a..40dc437bd 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java @@ -41,7 +41,7 @@ public class MetaUserGridOpiningEntity extends BaseEpdcEntity { /** * 网格id */ - private Long gridId; + private String gridId; /** * 用户总数 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java index e40107c7c..a8e0dbba3 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java @@ -24,6 +24,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.datasources.DataSourceNames; @@ -39,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -66,14 +68,14 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl metaUserGridOpiningEntityList = baseDao.pageselectListPage(params);