From 20265a287301b45ff7bb7de6a197b8110feaa853 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 15 七月 2021 17:38:37 +0800
Subject: [PATCH] 修改bug以及app端登录如果未绑定网格提示接口、首页左上角网格选择接口
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 cdbec76..ed84092 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
@@ -293,6 +293,8 @@
if (eventGridDataDO == null) {
return R.fail("网格不存在");
}
+ eventDO.setGridMemberCommunity(eventGridDataDO.getGridCommunityId());
+ eventDO.setGridMemberStreet(eventGridDataDO.getGridStreetId());
//检查特殊人群上报时参数
if(commonEventAddDTO.getEventType().equals(6)){
@@ -311,6 +313,7 @@
eventDO.setCreateBy(commonEventAddDTO.getUserId());
eventDO.setSubmitDate(new Date());
eventDO.setOrderSn(getEventOrderSn(eventDO.getEventType()));
+
if (eventMapper.insert(eventDO) == 1) {
//如果是特殊人群，则新增特殊人群与事件关系
@@ -1031,6 +1034,8 @@
eventDO.setEventCategory(2l);//宣传事件
eventDO.setEventStatus(2);//事件状态 2发布
eventDO.setEventType(8);
+ eventDO.setGridMemberCommunity(eventGridDataDO.getGridCommunityId());
+ eventDO.setGridMemberStreet(eventGridDataDO.getGridStreetId());
if(publicityEventAddDTO.getGridMemberId()!=null) {
eventDO.setGridMemberId(publicityEventAddDTO.getGridMemberId());
}else{
@@ -1748,9 +1753,9 @@
// 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("经纬度参数错误");
- }
+// if(!latLng.matches("[1-9][0-9](\\.[0-9]{1,6})?,[1-9][0-9]{2}(\\.[0-9]{1,6})?")){
+// return R.fail("经纬度参数错误");
+// }
String latLngArr[] = latLng.split(",");
try {
Double lat = Double.valueOf(latLngArr[1]);
--
Gitblit v1.7.1