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 4cd5b951e..acf61f309 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 @@ -5732,7 +5732,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem Integer sync = NumConstant.ZERO; LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(XxxdEventEntity::getId, xxxdEventEntityId); - try { +// try { //处理图片和语音,上传到市北的oss if(CollectionUtils.isNotEmpty(submitItemFormDTO.getImages())){ List images=getEpdcImgUrl(submitItemFormDTO.getImages()); @@ -5758,7 +5758,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (!gisGridRes.success() || null == gisGridRes.getData()) { internalRemark = "根据经纬度获取网格信息失败:" + gisGridRes.getMsg(); log.error("submitXxxdEventToItem上传到民生诉求异常:" + internalRemark); - return;// 测试时候注释掉,让它继续执行 + updateWrapper.set(StringUtils.isNotBlank(internalStatus), XxxdEventEntity::getInternalStatus, internalStatus) + .set(StringUtils.isNotBlank(bssbEventId), XxxdEventEntity::getBssbEventId, bssbEventId) + .set(StringUtils.isNotBlank(internalRemark), XxxdEventEntity::getInternalRemark, internalRemark) + .set(StringUtils.isNotBlank(gridId), XxxdEventEntity::getGridId, gridId) + .set(StringUtils.isNotBlank(gridName), XxxdEventEntity::getGridName, gridName) + .set(StringUtils.isNotBlank(communityId), XxxdEventEntity::getCommunityId, communityId) + .set(StringUtils.isNotBlank(streetId), XxxdEventEntity::getStreetId, streetId) + .set(null != sync, XxxdEventEntity::getSync, sync); + xxxdEventDao.update(null, updateWrapper); + throw new RenException(internalRemark); +// return;// 测试时候注释掉,让它继续执行 } else { gridId = String.valueOf(gisGridRes.getData().getGridId()); gridName = gisGridRes.getData().getGridName(); @@ -5801,21 +5811,31 @@ public class ItemServiceImpl extends BaseServiceImpl implem sync=NumConstant.ONE; log.info("submitXxxdEventToItem上传到民生诉求成功:bssbEventId:"+bssbEventId); } - } catch (Exception e) { - internalRemark="上传到民生诉求异常"; - log.error("submitXxxdEventToItem上传到民生诉求异常",e); - } finally { - log.info("最终都会被执行-------------------"); - updateWrapper.set(StringUtils.isNotBlank(internalStatus), XxxdEventEntity::getInternalStatus, internalStatus) - .set(StringUtils.isNotBlank(bssbEventId), XxxdEventEntity::getBssbEventId, bssbEventId) - .set(StringUtils.isNotBlank(internalRemark), XxxdEventEntity::getInternalRemark, internalRemark) - .set(StringUtils.isNotBlank(gridId), XxxdEventEntity::getGridId, gridId) - .set(StringUtils.isNotBlank(gridName), XxxdEventEntity::getGridName, gridName) - .set(StringUtils.isNotBlank(communityId), XxxdEventEntity::getCommunityId, communityId) - .set(StringUtils.isNotBlank(streetId), XxxdEventEntity::getStreetId, streetId) - .set(null != sync, XxxdEventEntity::getSync, sync); - xxxdEventDao.update(null, updateWrapper); - } + + updateWrapper.set(StringUtils.isNotBlank(internalStatus), XxxdEventEntity::getInternalStatus, internalStatus) + .set(StringUtils.isNotBlank(bssbEventId), XxxdEventEntity::getBssbEventId, bssbEventId) + .set(StringUtils.isNotBlank(internalRemark), XxxdEventEntity::getInternalRemark, internalRemark) + .set(StringUtils.isNotBlank(gridId), XxxdEventEntity::getGridId, gridId) + .set(StringUtils.isNotBlank(gridName), XxxdEventEntity::getGridName, gridName) + .set(StringUtils.isNotBlank(communityId), XxxdEventEntity::getCommunityId, communityId) + .set(StringUtils.isNotBlank(streetId), XxxdEventEntity::getStreetId, streetId) + .set(null != sync, XxxdEventEntity::getSync, sync); + xxxdEventDao.update(null, updateWrapper); +// } catch (Exception e) { +// internalRemark="上传到民生诉求异常"; +// log.error("submitXxxdEventToItem上传到民生诉求异常",e); +// } finally { +// log.info("最终都会被执行-------------------"); +// updateWrapper.set(StringUtils.isNotBlank(internalStatus), XxxdEventEntity::getInternalStatus, internalStatus) +// .set(StringUtils.isNotBlank(bssbEventId), XxxdEventEntity::getBssbEventId, bssbEventId) +// .set(StringUtils.isNotBlank(internalRemark), XxxdEventEntity::getInternalRemark, internalRemark) +// .set(StringUtils.isNotBlank(gridId), XxxdEventEntity::getGridId, gridId) +// .set(StringUtils.isNotBlank(gridName), XxxdEventEntity::getGridName, gridName) +// .set(StringUtils.isNotBlank(communityId), XxxdEventEntity::getCommunityId, communityId) +// .set(StringUtils.isNotBlank(streetId), XxxdEventEntity::getStreetId, streetId) +// .set(null != sync, XxxdEventEntity::getSync, sync); +// xxxdEventDao.update(null, updateWrapper); +// } }