袁强 3 months ago
parent
commit
498ba9278a
  1. 5
      dk-modules/business/pom.xml
  2. 2
      dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessOperationBo.java
  3. 8
      dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java
  4. 2
      dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessOperationServiceImpl.java
  5. 9
      dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java
  6. 5
      dk-modules/sample/pom.xml
  7. 30
      dk-modules/sample/src/main/java/org/dromara/sample/dubbo/RemoteJobServiceImpl.java
  8. 4
      dk-visual/nacos/src/main/resources/application.properties

5
dk-modules/business/pom.xml

@ -95,7 +95,10 @@
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>api-business</artifactId> <artifactId>api-business</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>api-sample</artifactId>
</dependency>
<!-- AutoPoi Excel工具类--> <!-- AutoPoi Excel工具类-->
<dependency> <dependency>
<groupId>org.jeecgframework</groupId> <groupId>org.jeecgframework</groupId>

2
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 }) @NotBlank(message = "航线名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String fileName; private String waylineName;
/** /**
* *
* jobName * jobName

8
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 org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.sample.api.domain.vo.RemoteMediaFileVo;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
@ -80,7 +81,7 @@ public class BusinessTaskVo implements Serializable {
private Long createDept; private Long createDept;
private String deptName; private String deptName;
private String waylineId; private String waylineId;
private String fileName; private String waylineName;
private String jobName; private String jobName;
private String jobId; private String jobId;
//操作者id //操作者id
@ -92,7 +93,6 @@ public class BusinessTaskVo implements Serializable {
//飞行说明 //飞行说明
private String flightExplain; private String flightExplain;
private List<RemoteMediaFileVo> mediaFileVoList;
} }

2
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 businessTaskVo = businessTaskService.queryById(bo.getTaskId());
businessTaskVo.setWaylineId(bo.getWaylineId()); businessTaskVo.setWaylineId(bo.getWaylineId());
businessTaskVo.setFileName(bo.getFileName()); businessTaskVo.setWaylineName(bo.getWaylineName());
businessTaskVo.setStatus(BusinessConstants.TASK_STATUS_1); businessTaskVo.setStatus(BusinessConstants.TASK_STATUS_1);
BusinessTask businessTask = MapstructUtils.convert(businessTaskVo, BusinessTask.class); BusinessTask businessTask = MapstructUtils.convert(businessTaskVo, BusinessTask.class);
businessTaskService.update(businessTask); businessTaskService.update(businessTask);

9
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.convert.Convert;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import org.apache.dubbo.config.annotation.DubboReference;
import org.dromara.business.domain.BusinessTask; import org.dromara.business.domain.BusinessTask;
import org.dromara.business.domain.bo.BusinessTaskBo; import org.dromara.business.domain.bo.BusinessTaskBo;
import org.dromara.business.domain.vo.BusinessTaskVo; import org.dromara.business.domain.vo.BusinessTaskVo;
@ -18,6 +19,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.mybatis.helper.DataPermissionHelper; import org.dromara.common.mybatis.helper.DataPermissionHelper;
import org.dromara.common.satoken.utils.LoginHelper; 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.dromara.system.api.model.LoginUser;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -38,6 +41,8 @@ import java.util.Collection;
public class BusinessTaskServiceImpl implements IBusinessTaskService { public class BusinessTaskServiceImpl implements IBusinessTaskService {
private final BusinessTaskMapper baseMapper; private final BusinessTaskMapper baseMapper;
@DubboReference
private final RemoteJobService jobService;
/** /**
* 查询工单预约 * 查询工单预约
@ -48,6 +53,10 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService {
@Override @Override
public BusinessTaskVo queryById(Long id){ public BusinessTaskVo queryById(Long id){
BusinessTaskVo businessTaskVo = baseMapper.selectVoById(id); BusinessTaskVo businessTaskVo = baseMapper.selectVoById(id);
if(StrUtil.isNotEmpty(businessTaskVo.getJobId())){
List<RemoteMediaFileVo> remoteMediaFileVo = jobService.getRemoteMediaFileVo(businessTaskVo.getJobId(), "jpeg,mp4");
businessTaskVo.setMediaFileVoList(remoteMediaFileVo);
}
return businessTaskVo; return businessTaskVo;
} }

5
dk-modules/sample/pom.xml

@ -99,6 +99,11 @@
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>api-system</artifactId> <artifactId>api-system</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>api-sample</artifactId>
<version>${revision}</version>
</dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>api-business</artifactId> <artifactId>api-business</artifactId>

30
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<RemoteMediaFileVo> getRemoteMediaFileVo(String jobId, String fileType) {
List<MediaFileEntity> remoteMediaFileVo = fileService.getRemoteMediaFileVo(jobId, fileType);
List<RemoteMediaFileVo> mediaFileEntities = MapstructUtils.convert(remoteMediaFileVo, RemoteMediaFileVo.class);
return mediaFileEntities;
}
}

4
dk-visual/nacos/src/main/resources/application.properties

@ -40,9 +40,9 @@ spring.sql.init.platform=mysql
db.num=1 db.num=1
### Connect URL of DB: ### 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.user.0=root
db.password.0=123456 db.password.0=dkcy@yf
### the maximum retry times for push ### the maximum retry times for push
nacos.config.push.maxRetryTime=50 nacos.config.push.maxRetryTime=50

Loading…
Cancel
Save