From a3954af108b1fe55be2d40ddf8545d8eb2851b6b Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 19 Aug 2022 08:00:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=87=8F=E5=B0=91=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8A=9B=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mq/listener/OpenDataOrgChangeEventListener.java | 6 +----- .../mq/listener/OpenDataPatrolChangeEventListener.java | 6 +----- .../mq/listener/OpenDataProjectChangeEventListener.java | 6 +----- .../mq/listener/OpenDataStaffChangeEventListener.java | 8 +------- .../service/impl/GridstaffWorkInfoPingyinServiceImpl.java | 4 ++++ 5 files changed, 8 insertions(+), 22 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java index d1b1bf0912..654246351c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java @@ -6,7 +6,6 @@ import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.exception.ExceptionUtils; -import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.SpringContextUtils; @@ -106,12 +105,9 @@ public class OpenDataOrgChangeEventListener implements MessageListenerConcurrent SpringContextUtils.getBean(GridInfoPingyinService.class).exractGrid(extractFormDto); } - } catch (RenException e) { - // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 - logger.error("【开放数据事件监听器】-组织信息变更-同步信息到中间库失败:".concat(ExceptionUtils.getErrorStackTrace(e))); } catch (Exception e) { // 不是我们自己抛出的异常，可以让MQ重试 - logger.error("【开放数据事件监听器】-组织信息变更-同步信息到中间库失败:".concat(ExceptionUtils.getErrorStackTrace(e))); + logger.warn("【开放数据事件监听器】-组织信息变更-同步信息到中间库失败:".concat(ExceptionUtils.getErrorStackTrace(e))); throw e; } finally { distributedLock.unLock(lock); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java index 5c3bbb4404..44ac2386a5 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java @@ -9,7 +9,6 @@ import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; -import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.SpringContextUtils; @@ -109,12 +108,9 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"消费失败!"); } - } catch (RenException e) { - // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 - logger.error("【开放数据事件监听器】-巡查记录信息变更-失败:".concat(ExceptionUtils.getErrorStackTrace(e))); } catch (Exception e) { // 不是我们自己抛出的异常，可以让MQ重试 - logger.error("【开放数据事件监听器】-巡查记录信息变更-失败:".concat(ExceptionUtils.getErrorStackTrace(e))); + logger.warn("【开放数据事件监听器】-巡查记录信息变更-失败:".concat(ExceptionUtils.getErrorStackTrace(e))); throw e; } finally { distributedLock.unLock(lock); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java index 1912fc95a3..77697c2a2f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java @@ -5,7 +5,6 @@ import com.epmet.commons.rocketmq.constants.MQUserPropertys; import com.epmet.commons.rocketmq.messages.DisputeProcessMQMsg; import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.exception.ExceptionUtils; -import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.ConvertUtils; @@ -77,12 +76,9 @@ public class OpenDataProjectChangeEventListener implements MessageListenerConcur 30L, 30L, TimeUnit.SECONDS); //SpringContextUtils.getBean(BaseDisputeProcessService.class).getEventinfo(formDTO); SpringContextUtils.getBean(EventreportPingyinService.class).getEventInfo(formDTO); - } catch (RenException e) { - // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 - logger.error("【开放数据事件监听器】-项目信息变更-上报项目信息失败:".concat(ExceptionUtils.getErrorStackTrace(e))); } catch (Exception e) { // 不是我们自己抛出的异常，可以让MQ重试 - logger.error("【开放数据事件监听器】-项目信息变更-上报项目信息失败:".concat(ExceptionUtils.getErrorStackTrace(e))); + logger.warn("【开放数据事件监听器】-项目信息变更-上报项目信息失败:".concat(ExceptionUtils.getErrorStackTrace(e))); throw e; } finally { distributedLock.unLock(lock); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java index b2d9bd4976..1cf3a8f688 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java @@ -6,12 +6,10 @@ import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.exception.ExceptionUtils; -import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO; -import com.epmet.opendata.service.ExUserService; import com.epmet.opendata.service.GridstaffInfoPingyinService; import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; @@ -22,7 +20,6 @@ import org.redisson.api.RLock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; @@ -90,12 +87,9 @@ public class OpenDataStaffChangeEventListener implements MessageListenerConcurre SpringContextUtils.getBean(ExUserService.class).getStaffBaseInfo(dto);*/ dto.setStaffIdList(obj.getStaffIdList()); SpringContextUtils.getBean(GridstaffInfoPingyinService.class).getStaffBaseInfo(dto); - } catch (RenException e) { - // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 - logger.error("【开放数据事件监听器】-工作人员信息变更-初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e))); } catch (Exception e) { // 不是我们自己抛出的异常，可以让MQ重试 - logger.error("【开放数据事件监听器】-工作人员信息变更-初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e))); + logger.warn("【开放数据事件监听器】-工作人员信息变更-初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e))); throw e; } finally { distributedLock.unLock(lock); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java index 01ba8bd7b6..6b36c62d77 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java @@ -73,6 +73,10 @@ public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl { + if (StringUtils.isBlank(d.getGridId())){ + log.warn("data is null string:{}",JSON.toJSONString(d)); + return; + } GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(d.getGridId()); if (null == gridInfo) { log.warn("未查询到网格信息：" + d.getGridId()); From f23a21d5a45a25933f8a66a91649b9037e7db7f1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 19 Aug 2022 15:55:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B8=82=E9=87=8C?= =?UTF-8?q?=E7=9A=84=E5=8F=98=E5=8A=A8=E5=81=9A=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EventreportPingyinServiceImpl.java | 3 +-- .../service/impl/GridInfoPingyinServiceImpl.java | 11 +++++------ .../service/impl/GridstaffInfoPingyinServiceImpl.java | 3 +-- .../impl/GridstaffWorkInfoPingyinServiceImpl.java | 2 +- .../main/resources/mapper/EventreportPingyinDao.xml | 4 ++-- .../src/main/resources/mapper/GridInfoPingyinDao.xml | 9 ++++----- .../main/resources/mapper/GridstaffInfoPingyinDao.xml | 4 ++-- .../resources/mapper/GridstaffWorkInfoPingyinDao.xml | 4 ++-- 8 files changed, 18 insertions(+), 22 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java index 0fe4ff1620..624b89cfbb 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java @@ -21,7 +21,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -135,7 +134,7 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl 10) { entity.setLat(new BigDecimal(ag.getLatitude().substring(0, 10))); } else { @@ -256,7 +255,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(GridInfoPingyinEntity::getGridCode,formDTO.getOldCode()); int update = baseDao.update(gridInfoEntity, updateWrapper); @@ -265,7 +264,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl staffInfoWrapper = new LambdaUpdateWrapper<>(); staffInfoWrapper.eq(GridstaffInfoPingyinEntity::getGridCode,formDTO.getOldCode()); @@ -274,7 +273,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl workInfoWrapper = new LambdaUpdateWrapper<>(); workInfoWrapper.eq(GridstaffWorkInfoPingyinEntity::getGridCode,formDTO.getOldCode()); @@ -283,7 +282,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl eventWrapper = new LambdaUpdateWrapper<>(); eventWrapper.eq(EventreportPingyinEntity::getGridCode,formDTO.getOldCode()); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java index cb81df537d..34ea9c0da5 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java @@ -26,7 +26,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -138,7 +137,7 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl - DELETE FROM eventreport_pingyin + update eventreport_pingyin SET is_del = 'Y' - \ No newline at end of file + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml index c2eeb0baa9..9bbb6ca663 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml @@ -4,12 +4,12 @@ - delete from grid_info_pingyin where grid_level !='07' + update grid_info_pingyin set is_del = 'Y' where grid_level !='07' - delete from grid_info_pingyin where grid_level ='07' + update grid_info_pingyin set is_del = 'Y' where grid_level ='07' @@ -35,4 +35,4 @@ LIMIT 1 - \ No newline at end of file + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffWorkInfoPingyinDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffWorkInfoPingyinDao.xml index ea3bc11030..0cba8e6cf6 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffWorkInfoPingyinDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffWorkInfoPingyinDao.xml @@ -19,8 +19,8 @@ - delete from gridstaff_work_info_pingyin LIMIT 1000 + update gridstaff_work_info_pingyin SET is_del = 'Y' LIMIT 1000 - \ No newline at end of file + From 5bfd024f1bd2e0689605a22dc309cbfd38f61af8 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 23 Aug 2022 10:28:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E4=BB=8Euser=5Fbase=5Finfo=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-user-server/src/main/resources/mapper/UserDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml index 605350bde2..9bca7b1bf5 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml @@ -35,7 +35,7 @@ IFNULL(resi.ID,"") AS resiId, IFNULL(CONCAT(resi.SURNAME,resi.NAME),"") AS userRealName, IFNULL(relation.GRID_ID,"") AS gridId, - IFNULL(resi.id_num,'')AS idNum + IFNULL(wechat.id_num,'')AS idNum FROM USER user LEFT JOIN From 87fefea2fd3f039b6ecbad3b1a038064ef2b3759 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 24 Aug 2022 11:21:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=94=BE=E5=BC=80del=5Ff?= =?UTF-8?q?lag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 976ab930d6..9373743976 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1205,7 +1205,7 @@