From c64da5152d32c366eecfb20b3fdc023be1d27681 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 14 七月 2021 15:26:19 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 62 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index f034a98..4d51dc6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -121,9 +121,10 @@
eventVO.setVideos(videoList);
//查询网格员头像
- String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
- if (StringUtils.isNotEmpty(imageUrl)) {
- eventVO.setGridMemberImageUrl(imageUrl);
+ Map<String,String> userMap = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
+ if (StringUtils.isNotEmpty(userMap)) {
+ eventVO.setGridMemberName(userMap.get("nick_name"));
+ eventVO.setGridMemberImageUrl(userMap.get("image_url"));
}
});
return R.ok(ipage);
@@ -263,7 +264,7 @@
}
//当事件为特殊人群上报时，需要查询事件与人口关联关系
- if(eventDetailsVO.getEventType().equals(6)){
+ if(eventDetailsVO.getEventType() != null && eventDetailsVO.getEventType().equals(6)){
List<EventSpecialPopulationDetailsVO> specialPopulationList = eventSpecialCrowdRecordMapper.getSpecialPopulationIds(eventDetailsVO.getId());
if(!specialPopulationList.isEmpty()){
specialPopulationList.forEach(special -> {
@@ -1020,6 +1021,7 @@
}
EventDO eventDO = new EventDO();
BeanUtils.copyProperties(publicityEventAddDTO, eventDO);
+ eventDO.setHappenTime(publicityEventAddDTO.getPropagandaTime());
eventDO.setGridMemberId(publicityEventAddDTO.getUserId());
eventDO.setEventCategory(2l);//宣传事件
eventDO.setEventStatus(2);//事件状态 2发布
@@ -1264,9 +1266,10 @@
eventVO.setPics(picList);
eventVO.setVideos(videoList);
//查询网格员头像
- String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
- if (StringUtils.isNotEmpty(imageUrl)) {
- eventVO.setGridMemberImageUrl(imageUrl);
+ Map<String,String> userMap = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
+ if (StringUtils.isNotEmpty(userMap)) {
+ eventVO.setGridMemberName(userMap.get("nick_name"));
+ eventVO.setGridMemberImageUrl(userMap.get("image_url"));
}
});
return R.ok(ipage);
@@ -1325,9 +1328,10 @@
eventVO.setVideos(videoList);
//查询网格员头像
- String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
- if (StringUtils.isNotEmpty(imageUrl)) {
- eventVO.setGridMemberImageUrl(imageUrl);
+ Map<String,String> userMap = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
+ if (StringUtils.isNotEmpty(userMap)) {
+ eventVO.setGridMemberName(userMap.get("nick_name"));
+ eventVO.setGridMemberImageUrl(userMap.get("image_url"));
}
});
return R.ok(ipage);
@@ -1738,6 +1742,7 @@
// if(!latLng.matches("^[\\-\\+]?(0(\\.\\d{1,10})?|([1-9](\\d)?)(\\.\\d{1,10})?|1[0-7]\\d{1}(\\.\\d{1,10})?|180\\.0{1,10}),[\\-\\+]?((0|([1-8]\\d?))(\\.\\d{1,10})?|90(\\.0{1,10})?)$")){
// return R.fail("经纬度参数错误");
// }
+ //经纬度匹配规则：（短（纬度）在前长（经度）在后，不要擅自修改此规则，否则出现问题后果自负）
if(!latLng.matches("[1-9][0-9](\\.[0-9]{1,6})?,[1-9][0-9]{2}(\\.[0-9]{1,6})?")){
return R.fail("经纬度参数错误");
}
@@ -1933,6 +1938,16 @@
}
if(statisticsDetailVO.getNoEventZFTotal() == null){
statisticsDetailVO.setNoEventZFTotal(0);
+ }
+
+ //查询网格
+ EventGridDataDO gridDataDO = eventGridDataMapper.selectById(statisticsDTO.getGridId());
+ if(gridDataDO != null){
+ Map<String,Long> sspCountMap = this.baseMapper.getSSPEventTotal(gridDataDO.getGridCommunityId());
+ if(!sspCountMap.isEmpty()){
+ statisticsDetailVO.setEventSSPTotal(sspCountMap.get("eventSSPTotal")!=null?sspCountMap.get("eventSSPTotal").intValue():0);
+ statisticsDetailVO.setNoEventSSPTotal(sspCountMap.get("noEventSSPTotal")!=null?sspCountMap.get("noEventSSPTotal").intValue():0);
+ }
}
//统计数据
@@ -2196,7 +2211,12 @@
IPage<EventSpecialPopulationVO> specialPopulationVOIPage = this.baseMapper.specialPopulationList(new Page(specialPopulationDTO.getPageNum(), specialPopulationDTO.getPageSize()), specialPopulationDTO);
if(!specialPopulationVOIPage.getRecords().isEmpty()){
specialPopulationVOIPage.getRecords().forEach(specialPopulation -> {
- specialPopulation.setAge(IdcardUtil.getAgeByIdCard(specialPopulation.getIdCard()));
+ try {
+ Integer age = IdcardUtil.getAgeByIdCard(specialPopulation.getIdCard());
+ specialPopulation.setAge(age);
+ }catch (Exception e){
+ log.error("身份证号码转换年龄失败，人员id:" + specialPopulation.getId());
+ }
});
}
return R.ok(specialPopulationVOIPage);
@@ -2262,6 +2282,9 @@
List<EventWorkVO> list = new ArrayList<>();
for(EventWorkVO eventWorkVO: listHalfYearByDyn()){
EventWorkVO result = this.eventMapper.countByTime(eventWorkVO.getStart(),eventWorkVO.getEnd(),communityId);
+ result.setEventTotal(result.getEventTotal() + result.getSspTotal());
+ result.setEventAdd(result.getEventAdd() + result.getSspAdd());
+ result.setEventSolve(result.getEventSolve() + result.getSspSolve());
result.setMonth(eventWorkVO.getMonth());
list.add(result);
}
@@ -2284,11 +2307,11 @@
List<EventWorkVO> dateList = new ArrayList<>();
Date now = new Date();
for(int i= 6;i>=1;i--){
- Date date = DateUtils.getDateM(now,-i);
+ Date date = DateUtils.getDateM(now,-(i-1));
DateTime endDay = DateUtil.endOfMonth(date);
int m = DateUtil.month(endDay);
- m++;
+// m++;
if(m == 12){
m = 0;
}
@@ -2298,23 +2321,14 @@
EventWorkVO eventWorkVO = new EventWorkVO();
eventWorkVO.setMonth(monthStr[m]+"月上旬");
eventWorkVO.setStart(month+ "-01 00:00:00");
- eventWorkVO.setEnd(month+ "-"+half+" 23:59:58");
+ eventWorkVO.setEnd(month+ "-"+half+" 23:59:59");
dateList.add(eventWorkVO);
EventWorkVO eventWorkVO1 = new EventWorkVO();
eventWorkVO1.setMonth(monthStr[m]+"月下旬");
- eventWorkVO1.setStart(month+ "-"+half+" 23:59:58");
+ eventWorkVO1.setStart(month+ "-"+half+" 23:59:59");
eventWorkVO1.setEnd(DateUtils.getDateFormatString(endDay,"yyyy-MM-dd HH:mm:ss"));
dateList.add(eventWorkVO1);
}
return dateList;
-
}
-
- public static void main(String[] args) {
- String content = "30,104";
- String re = "[1-9][0-9](\\.[0-9]{1,6})?,[1-9][0-9]{2}(\\.[0-9]{1,6})?";
-
- System.out.println(content.matches(re));
- }
-
}
--
Gitblit v1.7.1