diff --git a/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessTaskService.java b/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessTaskService.java new file mode 100644 index 0000000..c0780ec --- /dev/null +++ b/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessTaskService.java @@ -0,0 +1,17 @@ +package org.dromara.business.api; + +/** + * @auther yq + * @data 2025/3/18 + */ +public interface RemoteBusinessTaskService { + + + /** + * 更新预约工单状态 + * @param fileId 航线id + * @param jobId 飞行记录id + * @param isJobStatus 飞行状态 + */ + void updateTaskStatus(String fileId, String jobId,Boolean isJobStatus); +} diff --git a/dk-common/common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/dk-common/common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java index f55260e..77ac95f 100644 --- a/dk-common/common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java +++ b/dk-common/common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java @@ -89,7 +89,7 @@ public class PlusDataPermissionHandler { // 获取数据权限配置 DataPermission dataPermission = getDataPermission(mappedStatementId); // 获取当前登录用户信息 - LoginUser currentUser = DataPermissionHelper.getVariable("user"); + LoginUser currentUser = LoginHelper.getLoginUser(); if (ObjectUtil.isNull(currentUser)) { currentUser = LoginHelper.getLoginUser(); DataPermissionHelper.setVariable("user", currentUser); diff --git a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessOperationController.java b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessOperationController.java index 634693c..ac92769 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessOperationController.java +++ b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessOperationController.java @@ -85,7 +85,7 @@ public class BusinessOperationController extends BaseController { /** * 上传航线-绑定工单 - */ + *//* @SaCheckPermission("system:operation:add") @Log(title = "运营中心-上传航线-绑定工单", businessType = BusinessType.INSERT) @RepeatSubmit() @@ -93,7 +93,7 @@ public class BusinessOperationController extends BaseController { public R bindFile(@Validated(AddGroup.class) BusinessOperationBo bo) { //根据工单绘制上传航线，绑定航线，填报信息 return toAjax(businessOperationService.insertByBo(bo)); - } + }*/ diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessOperation.java b/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessOperation.java index 030b6f3..06823ee 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessOperation.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessOperation.java @@ -41,10 +41,7 @@ public class BusinessOperation { */ private String nickName; - /** - * 工单状态（0预约中 1 等待中，2执行中 3 未完成 4已完结 ） - */ - private String taskStatus; + /** * 飞行时间 diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessTask.java b/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessTask.java index 7f45208..b95ad04 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessTask.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessTask.java @@ -62,4 +62,12 @@ public class BusinessTask extends BaseEntity { private String status; private String tenantId; + private String nickName; + private String deptName; + + private String fileId; + private String fileName; + private String jobName; + private String jobId; + } 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 126dc38..58f1629 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 @@ -50,11 +50,7 @@ public class BusinessOperationBo { private String nickName; - /** - * 工单状态（0预约中 1 等待中，2执行中 3 未完成 4已完结 ） - */ - private String taskStatus; /** * 飞行时间 @@ -63,14 +59,14 @@ public class BusinessOperationBo { private Date flightTime; /** - * 说明 + * 飞行说明 */ private String explain; /** * 设备sn */ - @NotBlank(message = "设备sn不能为空", groups = { AddGroup.class, EditGroup.class }) + private String deviceSn; /** @@ -78,6 +74,26 @@ public class BusinessOperationBo { */ @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map params = new HashMap<>(); - + /** + * + * 航线id + * */ + @NotBlank(message = "航线id不能为空", groups = { AddGroup.class, EditGroup.class }) private String fileId; + /** + * 航线名称 + * */ + @NotBlank(message = "航线名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String fileName; + /** + * + * jobName + * */ + private String jobName; + /** + * + * jobId + * */ + private String jobId; + } diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessTaskBo.java b/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessTaskBo.java index 390ac7e..88f6894 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessTaskBo.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessTaskBo.java @@ -45,7 +45,7 @@ public class BusinessTaskBo extends BaseEntity { * 期望完成时间 */ @NotNull(message = "期望完成时间不能为空", groups = { AddGroup.class, EditGroup.class }) - private String expectTime; + private Date expectTime; /** * 说明 @@ -57,7 +57,7 @@ public class BusinessTaskBo extends BaseEntity { * 完成时间 */ - private String completeTime; + private Date completeTime; /** * 工单状态（0预约中 1 等待中，2执行中 3 未完成 4已完结 ） @@ -72,4 +72,17 @@ public class BusinessTaskBo extends BaseEntity { private String nickName; private String deptName; + + private String fileId; + private String fileName; + private String jobName; + private String jobId; + //操作者id + private Long operatId; + //操作者名称 + private String operatName; + //飞行时间 + private Date flightTime; + //飞行说明 + private String flightExplain; } diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessOperationVo.java b/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessOperationVo.java index 0738e38..f6fae11 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessOperationVo.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessOperationVo.java @@ -52,12 +52,6 @@ public class BusinessOperationVo implements Serializable { @ExcelProperty(value = "处理人昵称") private String nickName; - /** - * 工单状态（0预约中 1 等待中，2执行中 3 未完成 4已完结 ） - */ - @ExcelProperty(value = "工单状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=预约中,1=,等待中，2执行中,3=,未完成,4=已完结") - private String taskStatus; /** * 飞行时间 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 3497403..78f415d 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 @@ -51,7 +51,7 @@ public class BusinessTaskVo implements Serializable { * 期望完成时间 */ @ExcelProperty(value = "期望完成时间") - private String expectTime; + private Date expectTime; private String verbalTrick; /** @@ -64,7 +64,7 @@ public class BusinessTaskVo implements Serializable { * 完成时间 */ @ExcelProperty(value = "完成时间") - private String completeTime; + private Date completeTime; /** * 工单状态（0预约中 1 等待中，2执行中 3 未完成 4已完结 ） @@ -79,4 +79,19 @@ public class BusinessTaskVo implements Serializable { private String nickName; private Long createDept; private String deptName; + private String fileId; + private String fileName; + private String jobName; + private String jobId; + //操作者id + private Long operatId; + //操作者名称 + private String operatName; + //飞行时间 + private Date flightTime; + //飞行说明 + private String flightExplain; + + + } diff --git a/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessTaskServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessTaskServiceImpl.java new file mode 100644 index 0000000..724abc3 --- /dev/null +++ b/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessTaskServiceImpl.java @@ -0,0 +1,24 @@ +package org.dromara.business.dubbo; + +import lombok.RequiredArgsConstructor; +import org.apache.dubbo.config.annotation.DubboService; +import org.dromara.business.api.RemoteBusinessTaskService; +import org.dromara.business.service.IBusinessTaskService; +import org.springframework.stereotype.Service; + +/** + * @auther yq + * @data 2025/3/18 + */ +@RequiredArgsConstructor +@Service +@DubboService +public class RemoteBusinessTaskServiceImpl implements RemoteBusinessTaskService { + private final IBusinessTaskService businessTaskService; + + + @Override + public void updateTaskStatus(String fileId, String jobId, Boolean isJobStatus) { + + } +} diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessOperationService.java b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessOperationService.java index 981bf0c..0a979f8 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessOperationService.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessOperationService.java @@ -24,6 +24,9 @@ public interface IBusinessOperationService { */ BusinessOperationVo queryById(Long id); + + BusinessOperationVo getBusinessOperationVo(Long task_id); + /** * 分页查询运营中心-工单处理列表 * 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 ddfa101..c5cd3c2 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 @@ -46,6 +46,11 @@ public class BusinessOperationServiceImpl implements IBusinessOperationService { return baseMapper.selectVoById(id); } + @Override + public BusinessOperationVo getBusinessOperationVo(Long taskId) { + return baseMapper.selectVoOne(Wrappers.lambdaQuery(BusinessOperation.class).eq(BusinessOperation::getTaskId, taskId)); + } + /** * 分页查询运营中心-工单处理列表 * @@ -78,7 +83,6 @@ public class BusinessOperationServiceImpl implements IBusinessOperationService { lqw.eq(bo.getTaskId() != null, BusinessOperation::getTaskId, bo.getTaskId()); lqw.eq(bo.getUserId() != null, BusinessOperation::getUserId, bo.getUserId()); lqw.like(StringUtils.isNotBlank(bo.getNickName()), BusinessOperation::getNickName, bo.getNickName()); - lqw.eq(StringUtils.isNotBlank(bo.getTaskStatus()), BusinessOperation::getTaskStatus, bo.getTaskStatus()); lqw.eq(bo.getFlightTime() != null, BusinessOperation::getFlightTime, bo.getFlightTime()); lqw.eq(StringUtils.isNotBlank(bo.getExplain()), BusinessOperation::getExplain, bo.getExplain()); lqw.eq(StringUtils.isNotBlank(bo.getDeviceSn()), BusinessOperation::getDeviceSn, bo.getDeviceSn()); 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 d671a22..694f263 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 @@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.system.api.model.LoginUser; import org.springframework.stereotype.Service; @@ -95,7 +96,7 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService { public Boolean insertByBo(BusinessTaskBo bo) { System.out.println("数据"+bo.getPolygonRegion()); // 获取当前登录用户信息 - LoginUser currentUser = DataPermissionHelper.getVariable("user"); + LoginUser currentUser = LoginHelper.getLoginUser(); bo.setCreateBy(currentUser.getUserId()); bo.setNickName(currentUser.getNickname()); bo.setCreateDept(currentUser.getDeptId()); @@ -103,12 +104,7 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService { bo.setTenantId(currentUser.getTenantId()); bo.setStatus("0"); bo.setCreateTime(new Date()); - String jsonString = JSON.toJSONString(bo.getPolygonRegion()); BusinessTask add = MapstructUtils.convert(bo, BusinessTask.class); - add.setPolygonRegion(jsonString); - if(StrUtil.isNotBlank(bo.getExpectTime())){ - add.setExpectTime(Convert.toDate(bo.getExpectTime())); - } boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml index 8c2e611..177b59d 100644 --- a/dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml +++ b/dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml @@ -18,6 +18,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + +