From 7470ddbebc1b5bd00f7b17fca093942358945805 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 21 Sep 2022 14:31:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/PushToCityGridService.java | 2 +- .../impl/PushToCityGridServiceImpl.java | 44 ++++++++++++++++--- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java index 91bad37d6..30233dbb4 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java @@ -171,7 +171,7 @@ public interface PushToCityGridService { * @Author zhaoqifeng * @Date 2022/9/19 15:03 */ - void evaluation(); + void evaluation(String itemId); /** * 2.13 初验申请 * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index 99c48804c..2052a87df 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java @@ -17,6 +17,7 @@ package com.elink.esua.epdc.modules.item.service.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.enums.CityPushEnum; @@ -32,10 +33,13 @@ import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum; import com.elink.esua.epdc.gird.city.api.CityGridApi; import com.elink.esua.epdc.modules.item.dao.ItemDao; import com.elink.esua.epdc.modules.item.dao.ItemHandleProcessDao; +import com.elink.esua.epdc.modules.item.dao.ItemReportInterfaceLogDao; import com.elink.esua.epdc.modules.item.entity.ItemEntity; +import com.elink.esua.epdc.modules.item.entity.ItemReportInterfaceLogEntity; import com.elink.esua.epdc.modules.item.service.ItemService; import com.elink.esua.epdc.modules.item.service.PushToCityGridService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -68,6 +72,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { private CityGridApi cityGridApi; @Resource private ItemDao itemDao; + @Resource + private ItemReportInterfaceLogDao itemReportInterfaceLogDao; @Override @@ -700,13 +706,15 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { * @Date 2022/9/19 15:03 */ @Override - public void evaluation() { + public void evaluation(String itemId) { // 昨天 String date = DateUtils.format(DateUtils.addDateDays(new Date(), -1)); //已评价的item LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.isNotNull(ItemEntity::getEvaluationScore); wrapper.isNotNull(ItemEntity::getSqid); + wrapper.eq(StringUtils.isNotBlank(itemId), ItemEntity::getId, itemId); + wrapper.le(StringUtils.isBlank(itemId), ItemEntity::getEvaluationTime, DateUtils.addDateDays(new Date(), -1)); List list = itemDao.selectList(wrapper); // 拼接数据 @@ -744,10 +752,14 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { czr.setSsjgmc(item.getGrid()); dto.setCzr(czr); // 组装好直接推送 - cityGridApi.sendItemToCity(dto, PushToCityGridConstant.EVALUATION, "诉求评价"); + + String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.EVALUATION, "诉求评价"); + + saveLog(item.getId(), null, "诉求评价", PushToCityGridConstant.EVALUATION, JSONObject.toJSONString(dto), result); }); } + /** * 2.13 初验申请 * @@ -783,7 +795,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { sqr.setSsjgmc(item.getGridUnitname()); dto.setSqr(sqr); // 组装好直接推送 - cityGridApi.sendItemToCity(dto, PushToCityGridConstant.EARLY_INSPECTION_APPLY, "初验申请"); + String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.EARLY_INSPECTION_APPLY, "初验申请"); + + saveLog(item.getItemId(), item.getId(), "初验申请", PushToCityGridConstant.EARLY_INSPECTION_APPLY, JSONObject.toJSONString(dto), result); }); } @@ -824,7 +838,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { czr.setSsjgmc(item.getGridUnitname()); dto.setCzr(czr); // 组装好直接推送 - cityGridApi.sendItemToCity(dto, PushToCityGridConstant.EARLY_INSPECTION, "诉求初验"); + String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.EARLY_INSPECTION, "诉求初验"); + + saveLog(item.getItemId(), item.getId(), "诉求初验", PushToCityGridConstant.EARLY_INSPECTION, JSONObject.toJSONString(dto), result); }); } @@ -867,8 +883,26 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { czr.setSsjgmc(item.getGridUnitname()); dto.setCzr(czr); // 组装好直接推送 - cityGridApi.sendItemToCity(dto, PushToCityGridConstant.END_INSPECTION, "诉求终验"); + String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.END_INSPECTION, "诉求终验"); + + saveLog(item.getItemId(), item.getId(), "诉求终验", PushToCityGridConstant.END_INSPECTION, JSONObject.toJSONString(dto), result); }); } + private void saveLog(String itemId, String processId, String interfaceName, String interfaceUrl, String callBody, String returnBody) { + ItemReportInterfaceLogEntity log = new ItemReportInterfaceLogEntity(); + log.setItemId(itemId); + log.setProcessId(processId); + log.setInterfaceName(interfaceName); + log.setInterfaceUrl(interfaceUrl); + if (NumConstant.ZERO_STR.equals(JSONObject.parseObject(returnBody).get("code").toString())) { + log.setSuccessFlag(NumConstant.ONE_STR); + } else { + log.setSuccessFlag(NumConstant.ZERO_STR); + } + log.setCallMsgBody(callBody); + log.setReturnMsgBody(returnBody); + itemReportInterfaceLogDao.insert(log); + } + }