From a46320761c23508056ba1b84cc6eb89640d13c6e Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 13:43:25 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=8B=E8=A1=8C?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=20mq=20=E7=94=9F=E4=BA=A7=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rocketmq/messages/BaseMQMsgDTO.java | 24 ++++ .../rocketmq/messages/StaffPatrolMQMsg.java | 8 +- .../com/epmet/constant/SystemMessageType.java | 6 + .../java/com/epmet/send/SendMqMsgUtil.java | 2 +- .../impl/SystemMessageServiceImpl.java | 5 + .../dto/form/PatrolRoutineWorkFormDTO.java | 2 - .../impl/PatrolRoutineWorkServiceImpl.java | 110 +++++++++++------- 7 files changed, 106 insertions(+), 51 deletions(-) create mode 100644 epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/BaseMQMsgDTO.java diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/BaseMQMsgDTO.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/BaseMQMsgDTO.java new file mode 100644 index 0000000000..a4d24560a7 --- /dev/null +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/BaseMQMsgDTO.java @@ -0,0 +1,24 @@ +package com.epmet.commons.rocketmq.messages; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 基础消息体 + * @author liujianjun + */ +@Data +public class BaseMQMsgDTO implements Serializable { + private static final long serialVersionUID = 1019260278983535301L; + /** + * 客户Id + */ + private String customerId; + + /** + * 对象id + */ + private String objectId; + +} diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/StaffPatrolMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/StaffPatrolMQMsg.java index d8d68cac56..e6632a72ca 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/StaffPatrolMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/StaffPatrolMQMsg.java @@ -7,12 +7,8 @@ import lombok.Data; * @author liujianjun */ @Data -public class StaffPatrolMQMsg { - /** - * 客户Id - */ - private String customerId; - +public class StaffPatrolMQMsg extends BaseMQMsgDTO { + private static final long serialVersionUID = 3039825049521866599L; /** * 巡查记录id */ diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java index 284be1cb95..60230d3a10 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java @@ -75,6 +75,11 @@ public interface SystemMessageType { */ String USER_PATROL_STOP = "user_patrol_stop"; + /** + * 添加例行工作 + */ + String PATROL_ROUTINE_WORK_ADD = "patrol_routine_work_add"; + /** * 项目变动 */ @@ -104,4 +109,5 @@ public interface SystemMessageType { * 需求完成，如果服务方是区域化党建单位，重新计算这个单位的满意度 */ String CAL_PARTY_UNIT_SATISFACTION = "cal_party_unit_satisfaction"; + } diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java index e232f5f635..fa5d21967a 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java @@ -132,7 +132,7 @@ public class SendMqMsgUtil { * @author wxz * @date 2021.06.21 12:46 */ - public boolean sendPatrolMqMsg(StaffPatrolMQMsg msg,String messageType) { + public boolean sendPatrolMqMsg(BaseMQMsgDTO msg, String messageType) { try { SystemMsgFormDTO msgForm = new SystemMsgFormDTO(); msgForm.setMessageType(messageType); diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java index 92703db76e..ac6a1ce8ee 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java @@ -181,6 +181,7 @@ public class SystemMessageServiceImpl implements SystemMessageService { break; case SystemMessageType.USER_PATROL_START: case SystemMessageType.USER_PATROL_STOP: + case SystemMessageType.PATROL_ROUTINE_WORK_ADD: topic = TopicConstants.PATROL; break; case SystemMessageType.PROJECT_ADD: @@ -195,6 +196,8 @@ public class SystemMessageServiceImpl implements SystemMessageService { case SystemMessageType.CAL_PARTY_UNIT_SATISFACTION: topic=TopicConstants.CAL_PARTY_UNIT_SATISFACTION; break; + default: + logger.info("getTopicByMsgType default topic:{}", msgType); } return topic; } @@ -244,6 +247,8 @@ public class SystemMessageServiceImpl implements SystemMessageService { l1LastAlertTime = now; } break; + default: + logger.info("blockedMqMsgScan default topic:{}", mcb.getTopic()); } } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java index 5a9f6d63e5..c97e3236af 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java @@ -24,8 +24,6 @@ public class PatrolRoutineWorkFormDTO implements Serializable { public interface AddOrUpdateForm { } - private String customerId; - @NotBlank(message = "网格ID不能为空", groups = AddOrUpdateForm.class) private String gridId; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java index 61bb3d0e39..574b1be44c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.rocketmq.messages.BaseMQMsgDTO; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.DictTreeResultDTO; @@ -28,6 +29,7 @@ import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.SystemMessageType; import com.epmet.dao.PatrolRoutineWorkDao; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.CustomerGridFormDTO; @@ -35,7 +37,9 @@ import com.epmet.dto.form.PatrolRoutineWorkFormDTO; import com.epmet.entity.PatrolRoutineWorkEntity; import com.epmet.entity.PatrolRoutineWorkTypeEntity; import com.epmet.feign.EpmetAdminOpenFeignClient; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.send.SendMqMsgUtil; import com.epmet.service.PatrolRoutineWorkService; import com.epmet.service.PatrolRoutineWorkTypeService; import lombok.extern.slf4j.Slf4j; @@ -66,7 +70,9 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl gridBaseInfoData = govOrgOpenFeignClient.getGridBaseInfoByGridId(gridFormDTO); - if (!gridBaseInfoData.success()) { - throw new EpmetException("查询网格基本信息失败......"); - } - CustomerGridDTO gridBaseInfo = gridBaseInfoData.getData(); - entity.setPids(gridBaseInfo.getPids()); - entity.setUserId(loginUserUtil.getLoginUserId()); - entity.setCustomerId(loginUserUtil.getLoginUserCustomerId()); - - //entity.setUserId("loginUserUtil.getLoginUserId()"); - //entity.setCustomerId("loginUserUtil.getLoginUserCustomerId()"); - baseDao.insert(entity); - - Result> mapResult = adminOpenFeignClient.dictTree(DictTypeEnum.PATROL_WORK_TYPE.getCode()); - if (mapResult == null || !mapResult.success() || CollectionUtils.isEmpty(mapResult.getData())) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "例行工作类型字典获取失败!"); + CustomerGridFormDTO gridFormDTO = new CustomerGridFormDTO(); + gridFormDTO.setGridId(formDTO.getGridId()); + Result gridBaseInfoData = govOrgOpenFeignClient.getGridBaseInfoByGridId(gridFormDTO); + if (!gridBaseInfoData.success()) { + throw new EpmetException("查询网格基本信息失败......"); + } + CustomerGridDTO gridBaseInfo = gridBaseInfoData.getData(); + entity.setPids(gridBaseInfo.getPids()); + entity.setUserId(loginUserUtil.getLoginUserId()); + entity.setCustomerId(loginUserUtil.getLoginUserCustomerId()); + + //entity.setUserId("loginUserUtil.getLoginUserId()"); + //entity.setCustomerId("loginUserUtil.getLoginUserCustomerId()"); + baseDao.insert(entity); + + Result> mapResult = adminOpenFeignClient.dictTree(DictTypeEnum.PATROL_WORK_TYPE.getCode()); + if (mapResult == null || !mapResult.success() || CollectionUtils.isEmpty(mapResult.getData())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "例行工作类型字典获取失败!"); + } + List dictTree = mapResult.getData(); + + Map pidsMap = new HashMap<>(); + + dictTree.forEach(dto -> buildAllParentIdPath(pidsMap, dto)); + + //插入分类 + List workTypeList = new ArrayList<>(); + for (String code : formDTO.getWorkTypeList()) { + PatrolRoutineWorkTypeEntity typeEntity = new PatrolRoutineWorkTypeEntity(); + typeEntity.setCustomerId(loginUserUtil.getLoginUserCustomerId()); + typeEntity.setRoutineWorkId(entity.getId()); + typeEntity.setWorkTypeCode(code); + StringBuilder pids = pidsMap.get(code); + typeEntity.setAllPCode(pids.length() == NumConstant.ZERO ? NumConstant.ZERO_STR : pids.toString()); + workTypeList.add(typeEntity); + } + patrolRoutineWorkTypeService.insertBatch(workTypeList); + } finally { + if (entity != null){ + sendPatrolMsg(entity.getCustomerId(),entity.getId(),SystemMessageType.PATROL_ROUTINE_WORK_ADD); + } } - List dictTree = mapResult.getData(); - - Map pidsMap = new HashMap<>(); - - dictTree.forEach(dto -> buildAllParentIdPath(pidsMap, dto)); - - List workTypeList = new ArrayList<>(); - formDTO.getWorkTypeList().forEach(code -> { - PatrolRoutineWorkTypeEntity typeEntity = new PatrolRoutineWorkTypeEntity(); - typeEntity.setCustomerId(loginUserUtil.getLoginUserCustomerId()); - typeEntity.setRoutineWorkId(entity.getId()); - typeEntity.setWorkTypeCode(code); - StringBuilder pids = pidsMap.get(code); - typeEntity.setAllPCode(pids.length() == NumConstant.ZERO ? NumConstant.ZERO_STR : pids.toString()); - workTypeList.add(typeEntity); - }); - patrolRoutineWorkTypeService.insertBatch(workTypeList); } @@ -154,6 +168,18 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl dtos = JSON.parseArray(str, DictTreeResultDTO.class); From d76b3f26ba406a6ea5a14645323cd56657ef9016 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 17:49:33 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C=20?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=B8=AD=E9=97=B4=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/dto/form/MidBaseFormDTO.java | 28 +++ .../commons/tools/dto/form/PageFormDTO.java | 2 + .../dto/user/param/MidPatrolFormDTO.java | 4 +- .../main/resources/mapper/user/UserDao.xml | 12 +- .../dto/form/UpsertPatrolRecordForm.java | 4 +- .../controller/InitDataController.java | 14 +- .../PatrolRoutineWorkController.java | 58 +++++ .../UserPatrolRecordController.java | 2 +- .../opendata/dao/PatrolRoutineWorkDao.java | 34 +++ .../entity/PatrolRoutineWorkEntity.java | 154 +++++++++++++ .../entity/UserPatrolRecordEntity.java | 2 +- .../OpenDataPatrolChangeEventListener.java | 11 +- .../epmet/opendata/service/ExDeptService.java | 4 +- .../epmet/opendata/service/ExUserService.java | 4 +- .../service/PatrolRoutineWorkService.java | 46 ++++ .../service/UserPatrolDetailService.java | 10 + .../impl/BaseDisputeProcessServiceImpl.java | 2 +- .../service/impl/ExDeptServiceImpl.java | 15 +- .../service/impl/ExUserServiceImpl.java | 16 +- .../impl/PatrolRoutingWorkServiceImpl.java | 203 ++++++++++++++++++ .../impl/UserPatrolRecordServiceImpl.java | 12 +- .../resources/mapper/PatrolRoutineWorkDao.xml | 35 +++ .../resources/mapper/UserPatrolRecordDao.xml | 2 +- .../dto/form/patrol/PatrolQueryFormDTO.java | 29 +++ .../dto/result/PatrolRoutineWorkResult.java | 78 +++++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 9 + .../EpmetUserOpenFeignClientFallback.java | 8 +- .../PatrolRoutineWorkController.java | 23 +- .../com/epmet/dao/PatrolRoutineWorkDao.java | 9 +- .../service/PatrolRoutineWorkService.java | 10 + .../impl/PatrolRoutineWorkServiceImpl.java | 10 + .../impl/StaffPatrolRecordServiceImpl.java | 2 +- .../resources/mapper/PatrolRoutineWorkDao.xml | 13 +- 33 files changed, 829 insertions(+), 36 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/MidBaseFormDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/PatrolRoutineWorkController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/PatrolRoutineWorkDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/PatrolRoutineWorkEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/PatrolRoutineWorkService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/PatrolRoutingWorkServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/patrol/PatrolQueryFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/MidBaseFormDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/MidBaseFormDTO.java new file mode 100644 index 0000000000..13e6459066 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/MidBaseFormDTO.java @@ -0,0 +1,28 @@ +package com.epmet.commons.tools.dto.form; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * desc:查询巡查 参数 + * + * @author zhaoqifeng + * @dscription + * @date 2021/6/7 16:23 + */ +@NoArgsConstructor +@Data +public class MidBaseFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = 7585836892408288392L; + /** + * 客户Id + */ + private String customerId; + /** + * 对象id 没有则查询全部 + */ + private String objectId; + +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/PageFormDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/PageFormDTO.java index 4820f4d50b..9922a2fb6e 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/PageFormDTO.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/PageFormDTO.java @@ -30,6 +30,8 @@ public class PageFormDTO { */ private Integer offset; + private boolean isPage = true; + public Integer getOffset() { return (pageNo-1)*pageSize; } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/param/MidPatrolFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/param/MidPatrolFormDTO.java index b0810e54cc..57a5a1d0c0 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/param/MidPatrolFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/param/MidPatrolFormDTO.java @@ -22,8 +22,8 @@ public class MidPatrolFormDTO extends PageFormDTO implements Serializable { */ private String customerId; /** - * 巡查记录id 没有则查询全部 + * 对象id 没有则查询全部 */ - private String patrolId; + private String objectId; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml index 6542440fb8..fa8b19cd6b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml @@ -1029,8 +1029,8 @@ LEFT JOIN staff_patrol_detail d ON m.ID = d.STAFF_PATROL_REC_ID WHERE 1 =1 - - AND m.ID = #{patrolId} + + AND m.ID = #{objectId} and m.CUSTOMER_ID = #{customerId} AND m.DEL_FLAG = '0' @@ -1044,22 +1044,22 @@ from staff_patrol_detail WHERE 1=1 - - AND staff_patrol_rec_id = #{patrolId} + + AND staff_patrol_rec_id = #{objectId} and CUSTOMER_ID = #{customerId} AND DEL_FLAG = '0' order by created_time LIMIT #{offset},#{pageSize} - + + SELECT + id, customer_id, grid_id, pids, user_id, title, happen_time, is_normal, work_content, + is_key_people_locate, key_people_status, address, longitude, latitude, del_flag, + revision, created_by, created_time, updated_by, updated_time + FROM epmet_user.patrol_routine_work + WHERE CUSTOMER_ID = #{customerId} + + AND ID = #{id} + + - \ No newline at end of file + From ebc1a793ffda858894cf99b5650dd7c3ca03d8ca Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 17:56:52 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C=20?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=B8=AD=E9=97=B4=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mq/listener/OpenDataPatrolChangeEventListener.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 04fbde9fe3..dd8cf1624b 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 @@ -12,6 +12,7 @@ import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.constant.SystemMessageType; import com.epmet.opendata.dto.form.UpsertPatrolRecordForm; +import com.epmet.opendata.service.PatrolRoutineWorkService; import com.epmet.opendata.service.UserPatrolRecordService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -95,7 +96,7 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm); break; case SystemMessageType.PATROL_ROUTINE_WORK_ADD: - aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm); + aBoolean = SpringContextUtils.getBean(PatrolRoutineWorkService.class).insertPatrolRecord(patrolRecordForm); break; default: log.error("错误的消息类型:{}", tags); From e5f35db0301e8f95789cb1c1edfabda15feb83e5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 18:19:41 +0800 Subject: [PATCH 04/12] =?UTF-8?q?MQ=E6=BC=8F=E6=8E=89=E7=9A=84=E4=B8=9C?= =?UTF-8?q?=E8=A5=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/SystemMessageServiceImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java index ac6a1ce8ee..e09378f184 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java @@ -19,6 +19,7 @@ import com.epmet.service.SystemMessageService; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.remoting.common.RemotingHelper; import org.apache.rocketmq.spring.core.RocketMQTemplate; @@ -128,6 +129,14 @@ public class SystemMessageServiceImpl implements SystemMessageService { meMessage.putUserProperty(MQUserPropertys.BLOCKED_MSG_LABEL, pendingMsgLabel); rocketMQTemplate.getProducer().send(meMessage); logger.info("【发送MQ系统消息】-发送到MQ成功"); + } catch (MQClientException e) { + String errorStackTrace = ExceptionUtils.getErrorStackTrace(e); + logger.error("【发送MQ系统消息】发送系统MQ消息失败，堆栈信息:{}", errorStackTrace); + + // 清理阻塞中的消息缓存 + redisUtils.delete(pendingMsgKey); + + throw new RenException(EpmetErrorCode.SYSTEM_MQ_MSG_SEND_FAIL.getCode()); } catch (Exception e) { String errorStackTrace = ExceptionUtils.getErrorStackTrace(e); logger.error("【发送MQ系统消息】发送系统MQ消息失败，堆栈信息:{}", errorStackTrace); From 3b00b13a6e845817019c0a6716eca4b1a0995714 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 18:22:27 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/SystemMessageServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java index e09378f184..0615843dae 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java @@ -131,12 +131,12 @@ public class SystemMessageServiceImpl implements SystemMessageService { logger.info("【发送MQ系统消息】-发送到MQ成功"); } catch (MQClientException e) { String errorStackTrace = ExceptionUtils.getErrorStackTrace(e); - logger.error("【发送MQ系统消息】发送系统MQ消息失败，堆栈信息:{}", errorStackTrace); + logger.error("【发送MQ系统消息】发送系统MQ消息失败，MQ中间件异常请检查:{}", errorStackTrace); // 清理阻塞中的消息缓存 redisUtils.delete(pendingMsgKey); - throw new RenException(EpmetErrorCode.SYSTEM_MQ_MSG_SEND_FAIL.getCode()); + throw new RenException(EpmetErrorCode.SYSTEM_MQ_MSG_SEND_FAIL.getCode(),e.getErrorMessage()); } catch (Exception e) { String errorStackTrace = ExceptionUtils.getErrorStackTrace(e); logger.error("【发送MQ系统消息】发送系统MQ消息失败，堆栈信息:{}", errorStackTrace); From d4241760dd971bfff6ffe1862dd8a3d0a6e89f7e Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 18:37:51 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=B8=8D=E7=9F=A5=E9=81=93=E6=80=8E?= =?UTF-8?q?=E4=B9=88=E7=9D=80=E4=BB=A3=E7=A0=81=E6=B2=A1=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/SystemMessageServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java index 0615843dae..a6d2d1d852 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java @@ -191,6 +191,7 @@ public class SystemMessageServiceImpl implements SystemMessageService { case SystemMessageType.USER_PATROL_START: case SystemMessageType.USER_PATROL_STOP: case SystemMessageType.PATROL_ROUTINE_WORK_ADD: + topic = TopicConstants.PATROL; break; case SystemMessageType.PROJECT_ADD: @@ -206,7 +207,7 @@ public class SystemMessageServiceImpl implements SystemMessageService { topic=TopicConstants.CAL_PARTY_UNIT_SATISFACTION; break; default: - logger.info("getTopicByMsgType default topic:{}", msgType); + logger.warn("getTopicByMsgType default msgType:{}", msgType); } return topic; } From 98fb950e6bf325eb56cc44cbd114116b13cf1445 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 18:47:56 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E8=81=94=E8=B0=83=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mq/listener/OpenDataPatrolChangeEventListener.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 dd8cf1624b..034e4ac54b 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 @@ -3,7 +3,6 @@ package com.epmet.opendata.mq.listener; import com.alibaba.fastjson.JSON; import com.epmet.commons.rocketmq.constants.MQUserPropertys; import com.epmet.commons.rocketmq.messages.StaffPatrolMQMsg; -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; @@ -71,10 +70,10 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr logger.info("【开放数据事件监听器】-巡查记录信息变更-收到消息内容:{}, 操作:{}", msg, tags); StaffPatrolMQMsg msgObj = JSON.parseObject(msg, StaffPatrolMQMsg.class); - //只推送平阴数据 - if (!StrConstant.PY_CUSTOMER.equals(msgObj.getCustomerId())) { + //只推送平阴数据 todo 先干掉测试 + /*if (!StrConstant.PY_CUSTOMER.equals(msgObj.getCustomerId())) { return; - } + }*/ if (msgObj == null) { log.warn("consumeMessage msg body is blank"); return; From 63d17a6073086641f3fe7ff3b688c1b0349cab74 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 18:52:27 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E8=B4=B9=E5=8A=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/SystemMessageServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java index a6d2d1d852..a5c07f9ea1 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java @@ -19,6 +19,7 @@ import com.epmet.service.SystemMessageService; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.remoting.common.RemotingHelper; @@ -109,6 +110,10 @@ public class SystemMessageServiceImpl implements SystemMessageService { private void sendMQMessage(String messageType, String contentStr, String penddingId) { String topic = getTopicByMsgType(messageType); + if (StringUtils.isBlank(topic)){ + logger.warn("topic is not match,messageType:{}", messageType); + return; + } // 缓存下来，供滞留消息扫描。TTL -1，永不过期 String pendingMsgLabel = null; @@ -207,7 +212,7 @@ public class SystemMessageServiceImpl implements SystemMessageService { topic=TopicConstants.CAL_PARTY_UNIT_SATISFACTION; break; default: - logger.warn("getTopicByMsgType default msgType:{}", msgType); + logger.error("getTopicByMsgType msgType:{} is not support for any topic", msgType); } return topic; } From b4586286c7a7e280d85fb7a6aa0977492c26d877 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 19:13:21 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E8=A1=A8=E5=90=8D=E5=92=8C=E7=B1=BB?= =?UTF-8?q?=E5=90=8D=E7=BB=9F=E7=BB=9F=E6=8D=A2=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ler.java => BaseGridDailyworkController.java} | 10 +++++----- .../opendata/controller/InitDataController.java | 6 +++--- .../epmet/opendata/dao/PatrolRoutineWorkDao.java | 4 ++-- ...kEntity.java => BaseGridDailyworkEntity.java} | 4 ++-- .../OpenDataPatrolChangeEventListener.java | 4 ++-- ...ervice.java => BaseGridDailyworkService.java} | 4 ++-- ...pl.java => BaseGridDailyworkServiceImpl.java} | 16 ++++++++-------- .../resources/mapper/PatrolRoutineWorkDao.xml | 2 +- .../dto/result/PatrolRoutineWorkResult.java | 2 +- .../impl/PatrolRoutineWorkServiceImpl.java | 4 ++-- .../resources/mapper/PatrolRoutineWorkDao.xml | 14 +++++++++----- 11 files changed, 37 insertions(+), 33 deletions(-) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/{PatrolRoutineWorkController.java => BaseGridDailyworkController.java} (86%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/{PatrolRoutineWorkEntity.java => BaseGridDailyworkEntity.java} (96%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/{PatrolRoutineWorkService.java => BaseGridDailyworkService.java} (89%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/{PatrolRoutingWorkServiceImpl.java => BaseGridDailyworkServiceImpl.java} (93%) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/PatrolRoutineWorkController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridDailyworkController.java similarity index 86% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/PatrolRoutineWorkController.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridDailyworkController.java index e04aa8b10f..1c663a2708 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/PatrolRoutineWorkController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridDailyworkController.java @@ -21,7 +21,7 @@ package com.epmet.opendata.controller; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.opendata.dto.form.UpsertPatrolRecordForm; -import com.epmet.opendata.service.PatrolRoutineWorkService; +import com.epmet.opendata.service.BaseGridDailyworkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -36,11 +36,11 @@ import org.springframework.web.bind.annotation.RestController; * @since v1.0.0 2021-12-24 */ @RestController -@RequestMapping("patrolroutinework") -public class PatrolRoutineWorkController { +@RequestMapping("basegriddailywork") +public class BaseGridDailyworkController { @Autowired - private PatrolRoutineWorkService patrolRoutineWorkService; + private BaseGridDailyworkService baseGridDailyworkService; /** @@ -50,7 +50,7 @@ public class PatrolRoutineWorkController { @PostMapping("sync") public Result getStaffBaseInfo(@RequestBody(required = false) UpsertPatrolRecordForm formDTO) { ValidatorUtils.validateEntity(formDTO); - patrolRoutineWorkService.insertPatrolRecord(formDTO); + baseGridDailyworkService.insertPatrolRecord(formDTO); return new Result(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/InitDataController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/InitDataController.java index 3d811a690a..3e52870891 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/InitDataController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/InitDataController.java @@ -18,7 +18,7 @@ package com.epmet.opendata.controller; import com.epmet.commons.tools.utils.Result; -import com.epmet.opendata.service.PatrolRoutineWorkService; +import com.epmet.opendata.service.BaseGridDailyworkService; import com.epmet.opendata.service.UserPatrolRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; @@ -40,7 +40,7 @@ public class InitDataController { @Autowired private UserPatrolRecordService userPatrolRecordService; @Autowired - private PatrolRoutineWorkService patrolRoutineWorkService; + private BaseGridDailyworkService baseGridDailyworkService; /** * @Author sun @@ -57,6 +57,6 @@ public class InitDataController { **/ @PostMapping("routineWork/{customerId}") public Result reloadRoutineWorkData(@PathVariable String customerId) { - return new Result().ok(patrolRoutineWorkService.reloadPatrolData(customerId)); + return new Result().ok(baseGridDailyworkService.reloadPatrolData(customerId)); } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/PatrolRoutineWorkDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/PatrolRoutineWorkDao.java index 25ccd881df..62d7112d92 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/PatrolRoutineWorkDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/PatrolRoutineWorkDao.java @@ -19,7 +19,7 @@ package com.epmet.opendata.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.opendata.entity.PatrolRoutineWorkEntity; +import com.epmet.opendata.entity.BaseGridDailyworkEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -29,6 +29,6 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2021-12-24 */ @Mapper -public interface PatrolRoutineWorkDao extends BaseDao { +public interface PatrolRoutineWorkDao extends BaseDao { } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/PatrolRoutineWorkEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseGridDailyworkEntity.java similarity index 96% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/PatrolRoutineWorkEntity.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseGridDailyworkEntity.java index 964a242076..d33e232673 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/PatrolRoutineWorkEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseGridDailyworkEntity.java @@ -32,8 +32,8 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("patrol_routine_work") -public class PatrolRoutineWorkEntity implements Serializable { +@TableName("base_grid_dailywork") +public class BaseGridDailyworkEntity implements Serializable { private static final long serialVersionUID = 1L; 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 034e4ac54b..8c4db7b3e4 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 @@ -11,7 +11,7 @@ import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.constant.SystemMessageType; import com.epmet.opendata.dto.form.UpsertPatrolRecordForm; -import com.epmet.opendata.service.PatrolRoutineWorkService; +import com.epmet.opendata.service.BaseGridDailyworkService; import com.epmet.opendata.service.UserPatrolRecordService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -95,7 +95,7 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm); break; case SystemMessageType.PATROL_ROUTINE_WORK_ADD: - aBoolean = SpringContextUtils.getBean(PatrolRoutineWorkService.class).insertPatrolRecord(patrolRecordForm); + aBoolean = SpringContextUtils.getBean(BaseGridDailyworkService.class).insertPatrolRecord(patrolRecordForm); break; default: log.error("错误的消息类型:{}", tags); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/PatrolRoutineWorkService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BaseGridDailyworkService.java similarity index 89% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/PatrolRoutineWorkService.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BaseGridDailyworkService.java index cf9e5367e2..0d40bb6aea 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/PatrolRoutineWorkService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BaseGridDailyworkService.java @@ -19,7 +19,7 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.opendata.dto.form.UpsertPatrolRecordForm; -import com.epmet.opendata.entity.PatrolRoutineWorkEntity; +import com.epmet.opendata.entity.BaseGridDailyworkEntity; /** * 用户巡查主记录 @@ -27,7 +27,7 @@ import com.epmet.opendata.entity.PatrolRoutineWorkEntity; * @author generator generator@elink-cn.com * @since v1.0.0 2021-10-14 */ -public interface PatrolRoutineWorkService extends BaseService { +public interface BaseGridDailyworkService extends BaseService { /** * desc：根据条件插入巡查记录 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/PatrolRoutingWorkServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java similarity index 93% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/PatrolRoutingWorkServiceImpl.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java index 317a93f07d..ef1a99346a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/PatrolRoutingWorkServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java @@ -32,11 +32,11 @@ import com.epmet.opendata.dao.PatrolRoutineWorkDao; import com.epmet.opendata.dto.ExDeptDTO; import com.epmet.opendata.dto.ExUserDTO; import com.epmet.opendata.dto.form.UpsertPatrolRecordForm; -import com.epmet.opendata.entity.PatrolRoutineWorkEntity; +import com.epmet.opendata.entity.BaseGridDailyworkEntity; import com.epmet.opendata.entity.UserPatrolDetailEntity; import com.epmet.opendata.service.ExDeptService; import com.epmet.opendata.service.ExUserService; -import com.epmet.opendata.service.PatrolRoutineWorkService; +import com.epmet.opendata.service.BaseGridDailyworkService; import com.epmet.opendata.service.UserPatrolDetailService; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; @@ -57,7 +57,7 @@ import java.util.Map; */ @Slf4j @Service -public class PatrolRoutingWorkServiceImpl extends BaseServiceImpl implements PatrolRoutineWorkService { +public class BaseGridDailyworkServiceImpl extends BaseServiceImpl implements BaseGridDailyworkService { @Autowired private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @@ -121,7 +121,7 @@ public class PatrolRoutingWorkServiceImpl extends BaseServiceImpl list, boolean isReload, Map deptMap, Map userMap){ - List insertList = new ArrayList<>(); + List insertList = new ArrayList<>(); list.forEach(o-> insertList.add(buildEntity(o, deptMap, userMap))); //insert if (CollectionUtils.isEmpty(insertList)){ @@ -132,8 +132,8 @@ public class PatrolRoutingWorkServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PatrolRoutineWorkEntity::getCustomerId, list.get(0).getCustomerId()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(BaseGridDailyworkEntity::getCustomerId, list.get(0).getCustomerId()); int delete = baseDao.delete(wrapper); log.info("insertRecordBatch del patrol effectRow:{}",delete); this.saveOrUpdateBatch(insertList, NumConstant.ONE_HUNDRED); @@ -157,8 +157,8 @@ public class PatrolRoutingWorkServiceImpl extends BaseServiceImpl deptMap, Map userMap) { - PatrolRoutineWorkEntity entity = new PatrolRoutineWorkEntity(); + private BaseGridDailyworkEntity buildEntity(PatrolRoutineWorkResult record, Map deptMap, Map userMap) { + BaseGridDailyworkEntity entity = new BaseGridDailyworkEntity(); entity.setCustomerId(record.getCustomerId()); ExDeptDTO exDeptDTO = deptMap.getOrDefault(record.getGridId(),new ExDeptDTO()); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml index 94f86ebb27..6a0af99d7c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml @@ -3,7 +3,7 @@ - + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java index 55566e4094..5db6d41b24 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java @@ -31,7 +31,7 @@ public class PatrolRoutineWorkResult implements Serializable { private String workTypeFirstCode; /** - * 耳机工作类型 code + * 二级工作类型 code */ private String workTypeSecondCode; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java index f6c6928367..f431272c8e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java @@ -107,8 +107,8 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl> mapResult = adminOpenFeignClient.dictTree(DictTypeEnum.PATROL_WORK_TYPE.getCode()); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml index f55c95154a..11427a3b65 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml @@ -22,16 +22,20 @@ + From 3e9f52db11425b483f306b06d4f4968a7d140e1a Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 19:21:31 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E8=A1=A8=E5=90=8D=E5=92=8C=E7=B1=BB?= =?UTF-8?q?=E5=90=8D=E7=BB=9F=E7=BB=9F=E6=8D=A2=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/PatrolRoutineWorkDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml index 11427a3b65..d4445f2182 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml @@ -33,7 +33,7 @@ WHERE m.CUSTOMER_ID = #{customerId} - AND ID = #{id} + AND m.ID = #{id} AND m.DEL_FLAG = '0' From d436a9a22e0238b6dd4f6940f93f911d60d74cb6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 20:10:45 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=94=B9=E6=8E=89=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/UpsertPatrolRecordForm.java | 8 ++- .../BaseGridDailyworkController.java | 4 +- ...WorkDao.java => BaseGridDailyworkDao.java} | 2 +- .../entity/BaseGridDailyworkEntity.java | 5 +- .../impl/BaseGridDailyworkServiceImpl.java | 51 +++++-------------- ...neWorkDao.xml => BaseGridDailyworkDao.xml} | 2 +- 6 files changed, 27 insertions(+), 45 deletions(-) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/{PatrolRoutineWorkDao.java => BaseGridDailyworkDao.java} (94%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/{PatrolRoutineWorkDao.xml => BaseGridDailyworkDao.xml} (96%) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/UpsertPatrolRecordForm.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/UpsertPatrolRecordForm.java index c902a11905..3e1b0b4dd1 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/UpsertPatrolRecordForm.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/UpsertPatrolRecordForm.java @@ -1,6 +1,8 @@ package com.epmet.opendata.dto.form; import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; import lombok.Data; import javax.validation.constraints.NotEmpty; @@ -11,15 +13,17 @@ import javax.validation.constraints.NotEmpty; */ @Data public class UpsertPatrolRecordForm extends PageFormDTO { + /** * 客户Id */ - @NotEmpty(message = "customerId不能为空") + @NotEmpty(message = "customerId不能为空",groups = {DefaultGroup.class,AddGroup.class}) private String customerId; /** * 记录id */ + @NotEmpty(message = "id不能为空",groups = AddGroup.class) private String id; /** @@ -27,7 +31,7 @@ public class UpsertPatrolRecordForm extends PageFormDTO { * SystemMessageType.USER_PATROL_START * SystemMessageTypSTOP */ - @NotEmpty(message = "actionType不能为空") + @NotEmpty(message = "actionType不能为空",groups = DefaultGroup.class) private String actionType; } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridDailyworkController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridDailyworkController.java index 1c663a2708..4b27f0c0a3 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridDailyworkController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridDailyworkController.java @@ -20,6 +20,7 @@ package com.epmet.opendata.controller; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.opendata.dto.form.UpsertPatrolRecordForm; import com.epmet.opendata.service.BaseGridDailyworkService; import org.springframework.beans.factory.annotation.Autowired; @@ -42,14 +43,13 @@ public class BaseGridDailyworkController { @Autowired private BaseGridDailyworkService baseGridDailyworkService; - /** * @Author sun * @Description 巡查信息中间库同步 分页 **/ @PostMapping("sync") public Result getStaffBaseInfo(@RequestBody(required = false) UpsertPatrolRecordForm formDTO) { - ValidatorUtils.validateEntity(formDTO); + ValidatorUtils.validateEntity(formDTO, DefaultGroup.class); baseGridDailyworkService.insertPatrolRecord(formDTO); return new Result(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/PatrolRoutineWorkDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BaseGridDailyworkDao.java similarity index 94% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/PatrolRoutineWorkDao.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BaseGridDailyworkDao.java index 62d7112d92..f20f9612e7 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/PatrolRoutineWorkDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BaseGridDailyworkDao.java @@ -29,6 +29,6 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2021-12-24 */ @Mapper -public interface PatrolRoutineWorkDao extends BaseDao { +public interface BaseGridDailyworkDao extends BaseDao { } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseGridDailyworkEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseGridDailyworkEntity.java index d33e232673..8f8de7114b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseGridDailyworkEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseGridDailyworkEntity.java @@ -17,6 +17,7 @@ package com.epmet.opendata.entity; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -127,8 +128,8 @@ public class BaseGridDailyworkEntity implements Serializable { /** * 抽取状态：0是未抽取，1代表已抽取，2是抽取失败 */ - private String flag; - + //private String flag; + @TableLogic private String delFlag; /** diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java index ef1a99346a..3a65046992 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java @@ -18,25 +18,23 @@ package com.epmet.opendata.service.impl; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.dto.form.patrol.PatrolQueryFormDTO; import com.epmet.dto.result.PatrolRoutineWorkResult; -import com.epmet.dto.user.result.MidPatrolRecordResult; import com.epmet.feign.EpmetUserOpenFeignClient; -import com.epmet.opendata.dao.PatrolRoutineWorkDao; +import com.epmet.opendata.dao.BaseGridDailyworkDao; import com.epmet.opendata.dto.ExDeptDTO; import com.epmet.opendata.dto.ExUserDTO; import com.epmet.opendata.dto.form.UpsertPatrolRecordForm; import com.epmet.opendata.entity.BaseGridDailyworkEntity; -import com.epmet.opendata.entity.UserPatrolDetailEntity; +import com.epmet.opendata.service.BaseGridDailyworkService; import com.epmet.opendata.service.ExDeptService; import com.epmet.opendata.service.ExUserService; -import com.epmet.opendata.service.BaseGridDailyworkService; import com.epmet.opendata.service.UserPatrolDetailService; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; @@ -57,7 +55,7 @@ import java.util.Map; */ @Slf4j @Service -public class BaseGridDailyworkServiceImpl extends BaseServiceImpl implements BaseGridDailyworkService { +public class BaseGridDailyworkServiceImpl extends BaseServiceImpl implements BaseGridDailyworkService { @Autowired private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @@ -71,7 +69,7 @@ public class BaseGridDailyworkServiceImpl extends BaseServiceImpl> record = epmetUserOpenFeignClient.getPatrolRoutineWorkList(midPatrolFormDTO); if (record == null || !record.success()) { @@ -89,7 +87,7 @@ public class BaseGridDailyworkServiceImpl extends BaseServiceImpl pageSize ); return null; } - private Boolean insertRecordBatch(List list, boolean isReload, Map deptMap, Map userMap){ + private Boolean insertRecordBatch(List list, Map deptMap, Map userMap){ List insertList = new ArrayList<>(); list.forEach(o-> insertList.add(buildEntity(o, deptMap, userMap))); //insert @@ -128,34 +126,11 @@ public class BaseGridDailyworkServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(BaseGridDailyworkEntity::getCustomerId, list.get(0).getCustomerId()); - int delete = baseDao.delete(wrapper); - log.info("insertRecordBatch del patrol effectRow:{}",delete); this.saveOrUpdateBatch(insertList, NumConstant.ONE_HUNDRED); return true; } - @NotNull - private UserPatrolDetailEntity buildDetailEntity(MidPatrolRecordResult recordResult) { - UserPatrolDetailEntity detailEntity = new UserPatrolDetailEntity(); - detailEntity.setCustomerId(recordResult.getCustomerId()); - detailEntity.setStaffPatrolRecId(recordResult.getId()); - detailEntity.setRoute(recordResult.getRoute()); - detailEntity.setId(recordResult.getId()); - detailEntity.setRevision(recordResult.getRevision()); - detailEntity.setCreatedBy(recordResult.getCreatedBy()); - detailEntity.setCreatedTime(recordResult.getCreatedTime()); - detailEntity.setUpdatedBy(recordResult.getUpdatedBy()); - detailEntity.setUpdatedTime(recordResult.getUpdatedTime()); - detailEntity.setDelFlag(String.valueOf(recordResult.getDelFlag())); - return detailEntity; - } private BaseGridDailyworkEntity buildEntity(PatrolRoutineWorkResult record, Map deptMap, Map userMap) { BaseGridDailyworkEntity entity = new BaseGridDailyworkEntity(); @@ -178,13 +153,15 @@ public class BaseGridDailyworkServiceImpl extends BaseServiceImpl - + From 630048f22115d450ea3f41fdd49f82d17ca74cdb Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 20:24:15 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mq/listener/OpenDataPatrolChangeEventListener.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 8c4db7b3e4..e13b8d01b7 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 @@ -3,6 +3,7 @@ package com.epmet.opendata.mq.listener; import com.alibaba.fastjson.JSON; import com.epmet.commons.rocketmq.constants.MQUserPropertys; import com.epmet.commons.rocketmq.messages.StaffPatrolMQMsg; +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; @@ -70,10 +71,10 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr logger.info("【开放数据事件监听器】-巡查记录信息变更-收到消息内容:{}, 操作:{}", msg, tags); StaffPatrolMQMsg msgObj = JSON.parseObject(msg, StaffPatrolMQMsg.class); - //只推送平阴数据 todo 先干掉测试 - /*if (!StrConstant.PY_CUSTOMER.equals(msgObj.getCustomerId())) { + //只推送平阴数据 + if (!StrConstant.PY_CUSTOMER.equals(msgObj.getCustomerId())) { return; - }*/ + } if (msgObj == null) { log.warn("consumeMessage msg body is blank"); return;