Merge remote-tracking branch 'origin/master'

dk-common/common-core/src/main/java/org/dromara/common/core/constant/BusinessConstants.java

@@ -0,0 +1,34 @@
+package org.dromara.common.core.constant;
+
+/**
+ * @auther yq
+ * @data 2025/3/20
+ * 业务常量
+ */
+public interface BusinessConstants {
+    /** 工单状态
+     *  0-预约中
+     *  1-队列中
+     *  2-执行中
+     *  3-已完结
+     * */
+    String TASK_STATUS_0 = String.valueOf(0);
+    String TASK_STATUS_1 = String.valueOf(1);
+    String TASK_STATUS_2 = String.valueOf(2);
+    String TASK_STATUS_3 = String.valueOf(3);
+
+
+    /** 工单类型
+     *  1-广角拍照
+     *  2-红外拍照
+     *  3-广角视频
+     *  4-红外视频
+     *  5-喊话
+     * */
+    String TASK_TYPE_1 = String.valueOf(1);
+    String TASK_TYPE_2 = String.valueOf(2);
+    String TASK_TYPE_3 = String.valueOf(3);
+    String TASK_TYPE_4 = String.valueOf(4);
+    String TASK_TYPE_5 = String.valueOf(5);
+
+}

dk-modules/business/src/main/java/org/dromara/business/controller/BusinessOperationController.java

@@ -6,9 +6,16 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.business.domain.BusinessOperation;
+import org.dromara.business.domain.BusinessTask;
 import org.dromara.business.domain.bo.BusinessOperationBo;
+import org.dromara.business.domain.bo.BusinessTaskBo;
 import org.dromara.business.domain.vo.BusinessOperationVo;
+import org.dromara.business.domain.vo.BusinessTaskVo;
 import org.dromara.business.service.IBusinessOperationService;
+import org.dromara.business.service.IBusinessTaskService;
+import org.dromara.common.core.constant.BusinessConstants;
+import org.dromara.common.core.utils.MapstructUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -37,6 +44,8 @@ public class BusinessOperationController extends BaseController {
 
     private final IBusinessOperationService businessOperationService;
 
+
+
     /**
      * 查询运营中心-工单处理列表
      */
@@ -77,8 +86,6 @@ public class BusinessOperationController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody BusinessOperationBo bo) {
-         //根据工单绘制上传航线，绑定航线，填报信息
-
 
         return toAjax(businessOperationService.insertByBo(bo));
     }

dk-modules/business/src/main/java/org/dromara/business/domain/BusinessOperation.java

@@ -51,7 +51,7 @@ public class BusinessOperation {
     /**
      * 说明
      */
-    private String explain;
+    private String flightExplain;
 
     /**
      * 设备sn

dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessOperationBo.java

@@ -61,7 +61,7 @@ public class BusinessOperationBo {
     /**
      * 飞行说明
      */
-    private String explain;
+    private String flightExplain;
 
     /**
      * 设备sn
@@ -69,6 +69,9 @@ public class BusinessOperationBo {
 
     private String deviceSn;
 
+
+    private Date createTime;
+
     /**
      * 请求参数
      */

dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessOperationVo.java

@@ -63,7 +63,7 @@ public class BusinessOperationVo implements Serializable {
      * 说明
      */
     @ExcelProperty(value = "说明")
-    private String explain;
+    private String flightExplain;
 
     /**
      * 设备sn

dk-modules/business/src/main/java/org/dromara/business/service/IBusinessTaskService.java

@@ -1,6 +1,7 @@
 package org.dromara.business.service;
 
 
+import org.dromara.business.domain.BusinessTask;
 import org.dromara.business.domain.bo.BusinessTaskBo;
 import org.dromara.business.domain.vo.BusinessTaskVo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -58,6 +59,7 @@ public interface IBusinessTaskService {
      */
     Boolean updateByBo(BusinessTaskBo bo);
 
+    Boolean update(BusinessTask businessTask);
     /**
      * 校验并批量删除工单预约信息
      *

dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessOperationServiceImpl.java

@@ -5,10 +5,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.dromara.business.domain.BusinessOperation;
+import org.dromara.business.domain.BusinessTask;
 import org.dromara.business.domain.bo.BusinessOperationBo;
+import org.dromara.business.domain.bo.BusinessTaskBo;
 import org.dromara.business.domain.vo.BusinessOperationVo;
+import org.dromara.business.domain.vo.BusinessTaskVo;
 import org.dromara.business.mapper.BusinessOperationMapper;
 import org.dromara.business.service.IBusinessOperationService;
+import org.dromara.business.service.IBusinessTaskService;
+import org.dromara.common.core.constant.BusinessConstants;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -16,9 +21,12 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 
 
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.model.LoginUser;
 import org.springframework.stereotype.Service;
 
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -34,6 +42,7 @@ import java.util.Collection;
 public class BusinessOperationServiceImpl implements IBusinessOperationService {
 
     private final BusinessOperationMapper baseMapper;
+    private final IBusinessTaskService businessTaskService;
 
     /**
      * 查询运营中心-工单处理
@@ -84,7 +93,7 @@ public class BusinessOperationServiceImpl implements IBusinessOperationService {
         lqw.eq(bo.getUserId() != null, BusinessOperation::getUserId, bo.getUserId());
         lqw.like(StringUtils.isNotBlank(bo.getNickName()), BusinessOperation::getNickName, bo.getNickName());
         lqw.eq(bo.getFlightTime() != null, BusinessOperation::getFlightTime, bo.getFlightTime());
-        lqw.eq(StringUtils.isNotBlank(bo.getExplain()), BusinessOperation::getExplain, bo.getExplain());
+        lqw.eq(StringUtils.isNotBlank(bo.getFlightExplain()), BusinessOperation::getFlightExplain, bo.getFlightExplain());
         lqw.eq(StringUtils.isNotBlank(bo.getDeviceSn()), BusinessOperation::getDeviceSn, bo.getDeviceSn());
         return lqw;
     }
@@ -97,8 +106,19 @@ public class BusinessOperationServiceImpl implements IBusinessOperationService {
      */
     @Override
     public Boolean insertByBo(BusinessOperationBo bo) {
+        //根据工单绘制上传航线，绑定航线，填报信息
+        BusinessTaskVo businessTaskVo = businessTaskService.queryById(bo.getTaskId());
+        businessTaskVo.setFileId(bo.getFileId());
+        businessTaskVo.setFileName(bo.getFileName());
+        businessTaskVo.setStatus(BusinessConstants.TASK_STATUS_1);
+        BusinessTask businessTask = MapstructUtils.convert(businessTaskVo, BusinessTask.class);
+        businessTaskService.update(businessTask);
+        // 获取当前登录用户信息
+        LoginUser currentUser = LoginHelper.getLoginUser();
+        bo.setUserId(currentUser.getUserId());
+        bo.setNickName(currentUser.getNickname());
+        bo.setCreateTime(new Date());
         BusinessOperation add = MapstructUtils.convert(bo, BusinessOperation.class);
-        validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());

dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java

@@ -94,7 +94,6 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService {
      */
     @Override
     public Boolean insertByBo(BusinessTaskBo bo) {
-        System.out.println("数据"+bo.getPolygonRegion());
         // 获取当前登录用户信息
         LoginUser currentUser = LoginHelper.getLoginUser();
         bo.setCreateBy(currentUser.getUserId());
@@ -125,6 +124,11 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService {
         return baseMapper.updateById(update) > 0;
     }
 
+    @Override
+    public Boolean update(BusinessTask businessTask) {
+        return baseMapper.updateById(businessTask) > 0;
+    }
+
     /**
      * 保存前的数据校验
      */

dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml

@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         p.user_id AS operatId,
         p.nick_name AS operatName,
         p.flight_time AS flightTime,
-        p.EXPLAIN AS flightExplain
+        p.flight_explain AS flightExplain
         FROM
         business_task t
         LEFT JOIN business_operation p ON t.id = p.task_id