提交

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

@@ -440,8 +440,15 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
             List<BusinessAlert> businessAlerts = this.baseMapper.listAlert(businessAlertBo, startTime, endTime);
 
             businessAlerts.forEach(businessAlertVo->{
-                URL url = MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600);
-                businessAlertVo.setImages(url.toString());
+                if (businessAlertVo.getBusinessType() == 2){
+                    URL url = MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_DKCY, businessAlertVo.getImages(), 3600);
+
+                    businessAlertVo.setImages(url.toString());
+                }else {
+                    URL url = MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600);
+
+                    businessAlertVo.setImages(url.toString());
+                }
             });
 
             result.put("list",businessAlerts);
@@ -457,8 +464,15 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
         List<BusinessAlert> alertList = this.baseMapper.listAlert(businessAlertBo, startTime, endTime);
 
         alertList.forEach(businessAlertVo->{
-            URL url = MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600);
-            businessAlertVo.setImages(url.toString());
+            if (businessAlertVo.getBusinessType() == 2){
+                URL url = MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_DKCY, businessAlertVo.getImages(), 3600);
+
+                businessAlertVo.setImages(url.toString());
+            }else {
+                URL url = MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600);
+
+                businessAlertVo.setImages(url.toString());
+            }
         });
 
         handlerMap.put("total",alertList.size());
@@ -508,8 +522,15 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
         List<BusinessAlert> alertList = this.baseMapper.listAlert(businessAlertBo, startTime, endTime);
 
         alertList.forEach(businessAlertVo->{
-            URL url = MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600);
-            businessAlertVo.setImages(url.toString());
+            if (businessAlertVo.getBusinessType() == 2){
+                URL url = MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_DKCY, businessAlertVo.getImages(), 3600);
+
+                businessAlertVo.setImages(url.toString());
+            }else {
+                URL url = MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600);
+
+                businessAlertVo.setImages(url.toString());
+            }
         });
 
 

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

@@ -1,34 +1,28 @@
 package org.dromara.business.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
 import org.dromara.business.domain.BusinessTask;
 import org.dromara.business.domain.bo.BusinessTaskBo;
 import org.dromara.business.domain.vo.BusinessTaskVo;
 import org.dromara.business.mapper.BusinessTaskMapper;
 import org.dromara.business.service.IBusinessTaskService;
 import org.dromara.common.core.constant.BusinessConstants;
-import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-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.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.api.model.LoginUser;
 import org.springframework.stereotype.Service;
 
-
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 工单预约Service业务层处理
@@ -165,7 +159,7 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService {
         BusinessTaskVo businessTaskVo = this.queryBusinessTask(waylineId);
 
         if (ObjectUtil.isEmpty(businessTaskVo)) {
-            throw new ServiceException("工单不存在!");
+            return false;
         }
 
         BusinessTask businessTask = new BusinessTask();

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

@@ -533,13 +533,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ba.label_cn labelCn,
             ba.create_time createTime,
             ba.handle_type handleType,
+            ba.business_type businessType,
             ba.lat,
-            ba.lng,
-            b.flow_status flowStatus,
-            b.business_id businessId,
-            b.id instanceId
+            ba.lng
         from dk_business.business_alert ba
-             left join dk_workflow.flow_instance b on ba.id = b.business_id
         where 1=1
           and  <![CDATA[ DATE_FORMAT(ba.create_time, '%Y-%m-%d') >= #{startTime} ]]>
           and  <![CDATA[ DATE_FORMAT(ba.create_time, '%Y-%m-%d') <= #{endTime} ]]>

dk-modules/sample/src/main/java/org/dromara/sample/fegin/RemoteBusinessTaskFeign.java

@@ -1,5 +1,6 @@
 package org.dromara.sample.fegin;
 
+import org.dromara.common.core.domain.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -7,9 +8,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 @FeignClient(name = "gateway",path = "business")
 public interface RemoteBusinessTaskFeign {
 
-    @PostMapping("/update/status")
-    void updateTaskStatus(@RequestParam String waylineId,
-                          @RequestParam String status,
-                          @RequestParam(required = false) String jobId,
-                          @RequestParam(required = false) String jobName);
+    @PostMapping("/task/update/status")
+    public R<Boolean> updateTaskStatus(@RequestParam String waylineId,
+                                       @RequestParam String status,
+                                       @RequestParam(required = false) String jobId,
+                                       @RequestParam(required = false) String jobName);
 }

dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceQrtzController.java

@@ -15,7 +15,6 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.sample.manage.model.dto.DeviceQrtzDTO;
-import org.dromara.sample.manage.model.dto.DeviceQrtzFileDTO;
 import org.dromara.sample.manage.model.entity.DeviceQrtzEntity;
 import org.dromara.sample.manage.model.entity.DeviceQrtzFileEntity;
 import org.dromara.sample.manage.service.IDeviceQrtzService;
@@ -172,4 +171,17 @@ public class DeviceQrtzController extends BaseController {
     public R<Void> fileSort(@Validated@NotNull(message = "主键id不能为空") Long id ,@NotNull(message = "排序") Integer sort) {
         return toAjax(deviceQrtzService.fileSort(id,sort));
     }
+
+
+    /**
+     * 自动飞行 航线恢复
+     * @param id 主键id
+     * */
+    @SaCheckPermission("devict:qrtz:fileStatus")
+    @Log(title = "自动飞行编辑航线排序", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @GetMapping("/fileStatus")
+    public R<Void> fileStatus(@Validated@NotNull(message = "主键id不能为空") Long id ) {
+        return toAjax(deviceQrtzService.fileStatus(id));
+    }
 }

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceQrtzService.java

@@ -1,6 +1,5 @@
 package org.dromara.sample.manage.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.sample.manage.model.dto.DeviceDTO;
@@ -9,7 +8,6 @@ import org.dromara.sample.manage.model.dto.DeviceQrtzFileDTO;
 import org.dromara.sample.manage.model.entity.DeviceQrtzEntity;
 import org.dromara.sample.manage.model.entity.DeviceQrtzFileEntity;
 
-import java.sql.SQLException;
 import java.text.ParseException;
 import java.util.Collection;
 import java.util.List;
@@ -52,6 +50,7 @@ public interface IDeviceQrtzService {
 
     Boolean copy(Long qrtzId ,String starDate,String endDate);
     Boolean fileSort(Long id ,Integer sort);
+    Boolean fileStatus(Long id);
 
     //通知启用飞行任务
     void getDeviceQrtzFileEntity(DeviceDTO device);

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java

@@ -264,6 +264,14 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService {
         return deviceQrtzFileMapper.updateById(entity)>0;
     }
 
+    @Override
+    public Boolean fileStatus(Long id) {
+        DeviceQrtzFileEntity entity = new DeviceQrtzFileEntity();
+        entity.setStatus(1);
+        entity.setId(id);
+        return deviceQrtzFileMapper.updateById(entity)>0;
+    }
+
 
     @Override
     public void getDeviceQrtzFileEntity(DeviceDTO device) {

dk-modules/sample/src/main/resources/mapper/DeviceQrtzMapper.xml

@@ -6,17 +6,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap id="listManageFilePlatformInfoMap" type="org.dromara.sample.manage.model.entity.DeviceQrtzEntity">
         <result column="id" property="id" jdbcType="VARCHAR"/>
         <result column="device_sn" property="deviceSn" jdbcType="VARCHAR"/>
-        <result column="device_id" property="deviceId" jdbcType="VARCHAR"/>
         <result column="name" property="name" jdbcType="VARCHAR"/>
         <result column="status" property="status" jdbcType="VARCHAR"/>
         <collection column="{qrtzId=id}"
                     property="deviceQrtzDates" ofType="org.dromara.sample.manage.model.entity.DeviceQrtzDateEntity"
                     javaType="java.util.ArrayList"
-                    select="org.dromara.sample.manage.mapper.IDeviceQrtzDateMapper.listWaylineDeviceQrtzDateByQrtzAndDate"/>
+                    select="org.dromara.sample.manage.mapper.IDeviceQrtzDateMapper.listDeviceQrtzDateByQrtzAndDate"/>
     </resultMap>
 
 
-    <select id="listManageDeviceQrtz" resultType="org.dromara.sample.manage.model.entity.DeviceQrtzEntity">
+    <select id="listManageDeviceQrtz" resultMap="listManageFilePlatformInfoMap">
         SELECT wdq.* FROM manage_device_qrtz wdq
         LEFT JOIN  manage_device wd ON wdq.device_sn = wd.device_sn
         WHERE wdq.del_flag = 0