diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java index 400a0d3..c1b6be5 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java @@ -64,7 +64,17 @@ public class AdminResourceController { for (VvResourceEntity vvResourceEntity : vvResourceEntities) { VvResourceListDTO vvResourceDTO = new VvResourceListDTO(); BeanUtils.copyProperties(vvResourceEntity, vvResourceDTO); - vvResourceDTO.setLocations(vvResourceEntityList); + + + if(adminResourceRequest.getParentId() ==null){ + List vvResourceEntityListTemp = new ArrayList<>(); + getParentResource(vvResourceEntity.getParentId(), vvResourceEntityListTemp); + vvResourceDTO.setLocations(vvResourceEntityListTemp); + }else{ + vvResourceDTO.setLocations(vvResourceEntityList); + } + + vvResourceDTOS.add(vvResourceDTO); } pageUtils.setRows(vvResourceDTOS); @@ -76,11 +86,14 @@ public class AdminResourceController { * @param parentId */ public void getParentResource(Long parentId, List vvResourceEntityList) { - if (parentId <= 0) { + if (parentId ==null || parentId <= 0) { return; } VvResourceEntity vvResource = vvResourceDao.selectVvResourceById(parentId); + if(vvResource == null){ + return ; + } vvResourceEntityList.add(0,vvResource); getParentResource(vvResource.getParentId(), vvResourceEntityList); } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/listener/CreateDataQueueSimpleRabbitListener.java b/api-web/api-interface/src/main/java/com/heyu/api/listener/CreateDataQueueSimpleRabbitListener.java index 4928219..618d284 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/listener/CreateDataQueueSimpleRabbitListener.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/listener/CreateDataQueueSimpleRabbitListener.java @@ -38,6 +38,8 @@ public class CreateDataQueueSimpleRabbitListener { @RabbitListener(queues = "#{createDataQueue.name}", containerFactory = "accountAmountQueueSimpleRabbitListenerContainerFactory") public void consumeMessage(@Payload String message, @Header(AmqpHeaders.DELIVERY_TAG) long delivertTag, Channel channel) { try { + + log.info("CreateDataQueueSimpleRabbitListener 请求参数是message :{}", message); VvCreateDataConfigDTO vvCreateDataConfigDTO = JSONObject.parseObject(message, VvCreateDataConfigDTO.class); VvAllDataEntity vvAllData = vvAllDataDao.selectVvAllDataByRunIdRunDate(vvCreateDataConfigDTO.getId(), vvCreateDataConfigDTO.getRunDate()); if (vvAllData != null) { diff --git a/api-web/api-interface/src/main/java/com/heyu/api/listener/SendDingDingQueueSimpleRabbitListener.java b/api-web/api-interface/src/main/java/com/heyu/api/listener/SendDingDingQueueSimpleRabbitListener.java index ebbafbf..84d0b33 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/listener/SendDingDingQueueSimpleRabbitListener.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/listener/SendDingDingQueueSimpleRabbitListener.java @@ -51,6 +51,9 @@ public class SendDingDingQueueSimpleRabbitListener { public void consumeMessage(@Payload String message, @Header(AmqpHeaders.DELIVERY_TAG) long delivertTag, Channel channel) { try { + + log.info("SendDingDingQueueSimpleRabbitListener请求参数是message :{}", message); + VvChartConfigEntity vvChartConfigEntity = JSONObject.parseObject(message, VvChartConfigEntity.class); String configSql = vvChartConfigEntity.getSqlConfig(); String paramsConfig = vvChartConfigEntity.getParamsConfig(); @@ -93,17 +96,17 @@ public class SendDingDingQueueSimpleRabbitListener { file1.delete(); String url = ossUploadResult.getUrl(); - log.info("chartPic :{} url:{}",chartPic,url); + log.info("SendDingDingQueueSimpleRabbitListener chartPic :{} url:{}",chartPic,url); GouDeZhaoDDUtils.sendMarkDownOrder(headerName,url); } catch (Exception e) { - log.error("urlStatisticQueue handle", e); + log.error("SendDingDingQueueSimpleRabbitListener handle", e); } finally { try { - log.info("urlStatisticQueue消息{},消息确认完成", message); + log.info("SendDingDingQueueSimpleRabbitListener 消息{},消息确认完成", message); channel.basicAck(delivertTag, true); } catch (IOException e) { - log.error("urlStatisticQueue消息确认异常", e); + log.error("SendDingDingQueueSimpleRabbitListener消息确认异常", e); } } } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/schedule/impl/TestJob.java b/api-web/api-interface/src/main/java/com/heyu/api/schedule/impl/TestJob.java index 156cad3..700ae02 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/schedule/impl/TestJob.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/schedule/impl/TestJob.java @@ -52,6 +52,7 @@ public class TestJob { boolean isRun = CronTriggerUtils.isRun(date, vvCreateDataConfigEntity.getCronExp()); log.info("VvCreateDataConfigEntity current dateStr :{} , cronExp:{},isRun:{},date:{}", dateFormat.format(dateStr), vvCreateDataConfigEntity.getCronExp(), isRun,date); if (isRun) { + log.info("TestJob "); VvCreateDataConfigDTO dto = new VvCreateDataConfigDTO(); BeanUtils.copyProperties(vvCreateDataConfigEntity, dto); dto.setRunDate(dateFormat.format(dateStr));