From 1cb4f514c394be83708befd2e4f4842d74b7c322 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 25 Nov 2022 14:29:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 43 ++++---- .../consumer/ItemProcessModifyConsumer.java | 98 +++++++++---------- .../producer/ItemProcessModifyProducer.java | 92 ++++++++--------- 3 files changed, 116 insertions(+), 117 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 854fedacd..7223fb4e9 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -97,7 +97,6 @@ import com.elink.esua.epdc.modules.item.service.*; import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO; import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO; -import com.elink.esua.epdc.modules.rocketmq.producer.ItemProcessModifyProducer; import com.elink.esua.epdc.user.dto.UserDTO; import com.google.common.collect.Lists; import lombok.SneakyThrows; @@ -228,8 +227,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Autowired private ItemAutoProcessRedis itemAutoProcessRedis; - @Autowired - private ItemProcessModifyProducer itemProcessModifyProducer; +// @Autowired +// private ItemProcessModifyProducer itemProcessModifyProducer; @Resource private ItemDeptDao itemDeptDao; @@ -5187,25 +5186,25 @@ public class ItemServiceImpl extends BaseServiceImpl implem PushToCityGridConstant.APPEAL_WHISTLE_FEEDBACK, successFlag, formDTO.toString(), String.valueOf(result)); return new Result(); } - - /** - * 诉求延迟调用 - * - * @param dto - * @return void - * @author zhy - * @date 2022/11/1 13:55 - */ - private void sendMqMessage(CategoryDTO dto) { - // 获取旧信息 - ItemEntity entity = baseDao.getItemBySqid("sqid123"); - CategoryModifyDTO body = new CategoryModifyDTO(); - body.setCategoryId(dto.getId()); - body.setOldCategoryName(entity.getContactName()); - body.setNewCategoryName(dto.getCategoryName()); - itemProcessModifyProducer.sendMessage(RocketMqConstant.MQ_TOPIC_EVENT_ITEM_PROCESS, RocketMqConstant.MQ_TAG_EVENT_ITEM_PROCESS, - dto.getId().toString(), JSONObject.toJSONString(body)); - } +// +// /** +// * 诉求延迟调用 +// * +// * @param dto +// * @return void +// * @author zhy +// * @date 2022/11/1 13:55 +// */ +// private void sendMqMessage(CategoryDTO dto) { +// // 获取旧信息 +// ItemEntity entity = baseDao.getItemBySqid("sqid123"); +// CategoryModifyDTO body = new CategoryModifyDTO(); +// body.setCategoryId(dto.getId()); +// body.setOldCategoryName(entity.getContactName()); +// body.setNewCategoryName(dto.getCategoryName()); +// itemProcessModifyProducer.sendMessage(RocketMqConstant.MQ_TOPIC_EVENT_ITEM_PROCESS, RocketMqConstant.MQ_TAG_EVENT_ITEM_PROCESS, +// dto.getId().toString(), JSONObject.toJSONString(body)); +// } /** * 图片检查 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/ItemProcessModifyConsumer.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/ItemProcessModifyConsumer.java index 444e0af30..7a3aaf272 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/ItemProcessModifyConsumer.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/ItemProcessModifyConsumer.java @@ -1,49 +1,49 @@ -package com.elink.esua.epdc.modules.rocketmq.consumer; - -import com.alibaba.fastjson.JSONObject; -import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant; -import com.elink.esua.epdc.dto.item.ItemDTO; -import com.elink.esua.epdc.modules.item.service.ItemService; -import lombok.extern.slf4j.Slf4j; -import org.apache.rocketmq.common.message.MessageExt; -import org.apache.rocketmq.spring.annotation.MessageModel; -import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; -import org.apache.rocketmq.spring.core.RocketMQListener; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 三大诉求流程延迟处理-监听MQ消息 - * - * @author zhy - * @date 2022/10/28 19:45 - */ -@Slf4j -@Component -@RocketMQMessageListener(topic = RocketMqConstant.MQ_TOPIC_EVENT_ITEM_PROCESS, consumerGroup = "${rocketmq.consumer.process}", messageModel = MessageModel.BROADCASTING) -public class ItemProcessModifyConsumer implements RocketMQListener { - - @Autowired - private ItemService itemService; - - - @Override - public void onMessage(MessageExt messageExt) { - log.info("EPDC-EVENTS-SERVER消费消息START：{topic:{}, msgId:{}}", RocketMqConstant.MQ_TOPIC_EVENT_ITEM_PROCESS, messageExt.getMsgId()); - try { - String charset = "UTF-8"; - String body = new String(messageExt.getBody(), charset); - String tag = messageExt.getTags(); - ItemDTO dto = JSONObject.parseObject(body, ItemDTO.class); - if (RocketMqConstant.MQ_TAG_EVENT_ITEM_PROCESS.equals(tag)) { - System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>" + dto.getId()); - log.info(">>>>>>>>>>>>>>>>>>>>>>>" + dto.getId()); - } - - log.info("EPDC-EVENTS-SERVER消费消息END：{topic:{}, msgId:{}, body:{}}", RocketMqConstant.MQ_TOPIC_EVENT_ITEM_PROCESS, messageExt.getMsgId(), body); - } catch (Exception e) { - log.info("EPDC-EVENTS-SERVER消费消息失败：msgId:{}", messageExt.getMsgId()); - e.printStackTrace(); - } - } -} +//package com.elink.esua.epdc.modules.rocketmq.consumer; +// +//import com.alibaba.fastjson.JSONObject; +//import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant; +//import com.elink.esua.epdc.dto.item.ItemDTO; +//import com.elink.esua.epdc.modules.item.service.ItemService; +//import lombok.extern.slf4j.Slf4j; +//import org.apache.rocketmq.common.message.MessageExt; +//import org.apache.rocketmq.spring.annotation.MessageModel; +//import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; +//import org.apache.rocketmq.spring.core.RocketMQListener; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Component; +// +///** +// * 三大诉求流程延迟处理-监听MQ消息 +// * +// * @author zhy +// * @date 2022/10/28 19:45 +// */ +//@Slf4j +//@Component +//@RocketMQMessageListener(topic = RocketMqConstant.MQ_TOPIC_EVENT_ITEM_PROCESS, consumerGroup = "${rocketmq.consumer.process}", messageModel = MessageModel.BROADCASTING) +//public class ItemProcessModifyConsumer implements RocketMQListener { +// +// @Autowired +// private ItemService itemService; +// +// +// @Override +// public void onMessage(MessageExt messageExt) { +// log.info("EPDC-EVENTS-SERVER消费消息START：{topic:{}, msgId:{}}", RocketMqConstant.MQ_TOPIC_EVENT_ITEM_PROCESS, messageExt.getMsgId()); +// try { +// String charset = "UTF-8"; +// String body = new String(messageExt.getBody(), charset); +// String tag = messageExt.getTags(); +// ItemDTO dto = JSONObject.parseObject(body, ItemDTO.class); +// if (RocketMqConstant.MQ_TAG_EVENT_ITEM_PROCESS.equals(tag)) { +// System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>" + dto.getId()); +// log.info(">>>>>>>>>>>>>>>>>>>>>>>" + dto.getId()); +// } +// +// log.info("EPDC-EVENTS-SERVER消费消息END：{topic:{}, msgId:{}, body:{}}", RocketMqConstant.MQ_TOPIC_EVENT_ITEM_PROCESS, messageExt.getMsgId(), body); +// } catch (Exception e) { +// log.info("EPDC-EVENTS-SERVER消费消息失败：msgId:{}", messageExt.getMsgId()); +// e.printStackTrace(); +// } +// } +//} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/producer/ItemProcessModifyProducer.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/producer/ItemProcessModifyProducer.java index 19063cdc9..8a6a69976 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/producer/ItemProcessModifyProducer.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/producer/ItemProcessModifyProducer.java @@ -1,46 +1,46 @@ -package com.elink.esua.epdc.modules.rocketmq.producer; - -import lombok.extern.slf4j.Slf4j; -import org.apache.rocketmq.client.producer.SendResult; -import org.apache.rocketmq.common.message.Message; -import org.apache.rocketmq.spring.core.RocketMQTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 三大诉求流程延迟处理-发送MQ消息 - * - * @author zhy - * @date 2022/10/28 19:58 - */ -@Slf4j -@Component -public class ItemProcessModifyProducer { - - @Autowired - private RocketMQTemplate rocketMQTemplate; - - /** - * 发送消息 - * - * @return void - * @params [topic, tag, keys, body] - * @author liuchuang - * @since 2020/3/6 21:09 - */ - public void sendMessage(String topic, String tag, String keys, String body) { - Message message = new Message(topic, tag, keys, body.getBytes()); - // 18个级别 ("1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h";) - // level == 0，消息为非延迟消息 - // 1<=level<=maxLevel，消息延迟特定时间，例如level==1，延迟1s - // level > maxLevel，则level== maxLevel，例如level==20，延迟2h - message.setDelayTimeLevel(1); - try { - SendResult sendResult = rocketMQTemplate.getProducer().send(message); - log.info("EPDC-EVENTS-SERVER发送消息结果：{sendStatus:{}, topic:{}, msgId:{}}", sendResult.getSendStatus(), topic, sendResult.getMsgId()); - } catch (Exception e) { - log.error("EPDC-EVENTS-SERVER发送消息异常：{topic:{}, tag:{}, keys:{}, body:{}}", topic, tag, keys, body); - e.printStackTrace(); - } - } -} +//package com.elink.esua.epdc.modules.rocketmq.producer; +// +//import lombok.extern.slf4j.Slf4j; +//import org.apache.rocketmq.client.producer.SendResult; +//import org.apache.rocketmq.common.message.Message; +//import org.apache.rocketmq.spring.core.RocketMQTemplate; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Component; +// +///** +// * 三大诉求流程延迟处理-发送MQ消息 +// * +// * @author zhy +// * @date 2022/10/28 19:58 +// */ +//@Slf4j +//@Component +//public class ItemProcessModifyProducer { +// +// @Autowired +// private RocketMQTemplate rocketMQTemplate; +// +// /** +// * 发送消息 +// * +// * @return void +// * @params [topic, tag, keys, body] +// * @author liuchuang +// * @since 2020/3/6 21:09 +// */ +// public void sendMessage(String topic, String tag, String keys, String body) { +// Message message = new Message(topic, tag, keys, body.getBytes()); +// // 18个级别 ("1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h";) +// // level == 0，消息为非延迟消息 +// // 1<=level<=maxLevel，消息延迟特定时间，例如level==1，延迟1s +// // level > maxLevel，则level== maxLevel，例如level==20，延迟2h +// message.setDelayTimeLevel(1); +// try { +// SendResult sendResult = rocketMQTemplate.getProducer().send(message); +// log.info("EPDC-EVENTS-SERVER发送消息结果：{sendStatus:{}, topic:{}, msgId:{}}", sendResult.getSendStatus(), topic, sendResult.getMsgId()); +// } catch (Exception e) { +// log.error("EPDC-EVENTS-SERVER发送消息异常：{topic:{}, tag:{}, keys:{}, body:{}}", topic, tag, keys, body); +// e.printStackTrace(); +// } +// } +//} From bcaf86efe6f075e5b0ff9508ce768212f474637d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 28 Nov 2022 09:16:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8B=89=E5=8F=96=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/item/service/impl/ItemServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 7223fb4e9..9538c5249 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -4019,6 +4019,13 @@ public class ItemServiceImpl extends BaseServiceImpl implem } } } else if ("1".equals(formDto.getState())) { + + try { + this.queryItemHandle(itemHandleProcessDto.getItemId()); + }catch (Exception e) { + log.error("驳回拉取流程失败"); + } + itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue()); itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice()); itemHandleProcessDto.setGridPartyname("驳回");