quyixiao/eb-service-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2025-10-21 21:57:44 +08:00
parent 3e3e6bb16f
commit dacde34752
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java
View File

@ -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<VvResourceEntity> 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<VvResourceEntity> 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);
}

2
api-web/api-interface/src/main/java/com/heyu/api/listener/CreateDataQueueSimpleRabbitListener.java
View File

@ -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) {

11
api-web/api-interface/src/main/java/com/heyu/api/listener/SendDingDingQueueSimpleRabbitListener.java
View File

@ -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);
}
}
}

1
api-web/api-interface/src/main/java/com/heyu/api/schedule/impl/TestJob.java
View File

@ -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));