diff --git a/dk-modules/business/pom.xml b/dk-modules/business/pom.xml index 2d00876..15873b9 100644 --- a/dk-modules/business/pom.xml +++ b/dk-modules/business/pom.xml @@ -95,7 +95,10 @@ org.dromara api-business - + + org.dromara + api-sample + org.jeecgframework diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessOperationBo.java b/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessOperationBo.java index b32d452..3d1ef76 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessOperationBo.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessOperationBo.java @@ -87,7 +87,7 @@ public class BusinessOperationBo { * 航线名称 * */ @NotBlank(message = "航线名称不能为空", groups = { AddGroup.class, EditGroup.class }) - private String fileName; + private String waylineName; /** * * jobName diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java b/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java index 0617d2e..87f32e0 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java @@ -11,11 +11,12 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.sample.api.domain.vo.RemoteMediaFileVo; import java.io.Serial; import java.io.Serializable; import java.util.Date; - +import java.util.List; /** @@ -80,7 +81,7 @@ public class BusinessTaskVo implements Serializable { private Long createDept; private String deptName; private String waylineId; - private String fileName; + private String waylineName; private String jobName; private String jobId; //操作者id @@ -92,7 +93,6 @@ public class BusinessTaskVo implements Serializable { //飞行说明 private String flightExplain; - - + private List mediaFileVoList; } diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessOperationServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessOperationServiceImpl.java index 133ddfc..f0512b8 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessOperationServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessOperationServiceImpl.java @@ -109,7 +109,7 @@ public class BusinessOperationServiceImpl implements IBusinessOperationService { //根据工单绘制上传航线，绑定航线，填报信息 BusinessTaskVo businessTaskVo = businessTaskService.queryById(bo.getTaskId()); businessTaskVo.setWaylineId(bo.getWaylineId()); - businessTaskVo.setFileName(bo.getFileName()); + businessTaskVo.setWaylineName(bo.getWaylineName()); businessTaskVo.setStatus(BusinessConstants.TASK_STATUS_1); BusinessTask businessTask = MapstructUtils.convert(businessTaskVo, BusinessTask.class); businessTaskService.update(businessTask); diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java index c53435e..4a3c6f4 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java @@ -3,6 +3,7 @@ package org.dromara.business.service.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.business.domain.BusinessTask; import org.dromara.business.domain.bo.BusinessTaskBo; import org.dromara.business.domain.vo.BusinessTaskVo; @@ -18,6 +19,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.common.mybatis.helper.DataPermissionHelper; import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.sample.api.RemoteJobService; +import org.dromara.sample.api.domain.vo.RemoteMediaFileVo; import org.dromara.system.api.model.LoginUser; import org.springframework.stereotype.Service; @@ -38,6 +41,8 @@ import java.util.Collection; public class BusinessTaskServiceImpl implements IBusinessTaskService { private final BusinessTaskMapper baseMapper; + @DubboReference + private final RemoteJobService jobService; /** * 查询工单预约 @@ -48,6 +53,10 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService { @Override public BusinessTaskVo queryById(Long id){ BusinessTaskVo businessTaskVo = baseMapper.selectVoById(id); + if(StrUtil.isNotEmpty(businessTaskVo.getJobId())){ + List remoteMediaFileVo = jobService.getRemoteMediaFileVo(businessTaskVo.getJobId(), "jpeg,mp4"); + businessTaskVo.setMediaFileVoList(remoteMediaFileVo); + } return businessTaskVo; } diff --git a/dk-modules/sample/pom.xml b/dk-modules/sample/pom.xml index bd050ec..7694a75 100644 --- a/dk-modules/sample/pom.xml +++ b/dk-modules/sample/pom.xml @@ -99,6 +99,11 @@ org.dromara api-system + + org.dromara + api-sample + ${revision} + org.dromara api-business diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/dubbo/RemoteJobServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/dubbo/RemoteJobServiceImpl.java new file mode 100644 index 0000000..42e4da4 --- /dev/null +++ b/dk-modules/sample/src/main/java/org/dromara/sample/dubbo/RemoteJobServiceImpl.java @@ -0,0 +1,30 @@ +package org.dromara.sample.dubbo; + +import lombok.RequiredArgsConstructor; +import org.apache.dubbo.config.annotation.DubboService; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.sample.api.RemoteJobService; +import org.dromara.sample.api.domain.vo.RemoteMediaFileVo; +import org.dromara.sample.media.model.MediaFileEntity; +import org.dromara.sample.media.service.IFileService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @auther yq + * @data 2025/3/30 + */ +@RequiredArgsConstructor +@Service +@DubboService +public class RemoteJobServiceImpl implements RemoteJobService { + private final IFileService fileService; + + @Override + public List getRemoteMediaFileVo(String jobId, String fileType) { + List remoteMediaFileVo = fileService.getRemoteMediaFileVo(jobId, fileType); + List mediaFileEntities = MapstructUtils.convert(remoteMediaFileVo, RemoteMediaFileVo.class); + return mediaFileEntities; + } +} diff --git a/dk-visual/nacos/src/main/resources/application.properties b/dk-visual/nacos/src/main/resources/application.properties index 431e2e7..44fe8a3 100644 --- a/dk-visual/nacos/src/main/resources/application.properties +++ b/dk-visual/nacos/src/main/resources/application.properties @@ -40,9 +40,9 @@ spring.sql.init.platform=mysql db.num=1 ### Connect URL of DB: -db.url.0=jdbc:mysql://127.0.0.1:3307/dk_config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true +db.url.0=jdbc:mysql://114.235.183.147:3306/dk_config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true db.user.0=root -db.password.0=123456 +db.password.0=dkcy@yf ### the maximum retry times for push nacos.config.push.maxRetryTime=50