提交

dk-api/api-business/src/main/java/org/dromara/business/api/domain/vo/RemoteBusinessAlertVo.java

@@ -53,12 +53,12 @@ public class RemoteBusinessAlertVo implements Serializable {
     /**
      * 纬度
      */
-    private Long lat;
+    private String lat;
 
     /**
      * 精度
      */
-    private Long lng;
+    private String lng;
 
     /**
      * 标签名-中
@@ -156,6 +156,9 @@ public class RemoteBusinessAlertVo implements Serializable {
      */
     private Date handleTime;
 
+    private Date createTime;
+
+
     /**
      * 其他：内容
      */

dk-modules/business/pom.xml

@@ -30,7 +30,10 @@
             <groupId>org.dromara</groupId>
             <artifactId>common-log</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>common-oss</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>common-dict</artifactId>

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

@@ -169,6 +169,7 @@ public class BusinessAlert {
      */
     private String taskHandle;
 
+    private Date createTime;
     /**
      * 像素坐标
      */

dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessAlertServiceImpl.java

@@ -6,15 +6,16 @@ import org.apache.dubbo.config.annotation.DubboService;
 import org.dromara.business.api.RemoteBusinessAlertService;
 import org.dromara.business.api.domain.bo.RemoteBusinessAlertBo;
 import org.dromara.business.api.domain.vo.RemoteBusinessAlertVo;
-import org.dromara.business.domain.BusinessAlert;
+
 import org.dromara.business.domain.vo.BusinessAlertVo;
 import org.dromara.business.service.IBusinessAlertService;
-import org.dromara.common.core.enums.BusinessStatusEnum;
+import org.dromara.business.utils.MinioUntil;
-import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.business.utils.constants.MinIOConstants;
-import org.dromara.system.api.domain.vo.RemotePostVo;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.net.URL;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -54,6 +55,9 @@ public class RemoteBusinessAlertServiceImpl implements RemoteBusinessAlertServic
         List<BusinessAlertVo> businessAlerts = businessAlertService.listVerifyAlert(businessAlertBo);
         return businessAlerts.stream()
             .map(businessAlertVo -> {
+                System.out.println(businessAlertVo.getImages());
+                URL url = MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600);
+                businessAlertVo.setImages(url.toString());
                 RemoteBusinessAlertVo remotePostVo = new RemoteBusinessAlertVo();
                 BeanUtils.copyProperties(businessAlertVo, remotePostVo);
                 return remotePostVo;

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

@@ -79,6 +79,8 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
     public Boolean batchAddBusinessAlert(List<RemoteBusinessAlertVo> alertVoList) {
         List<BusinessAlert> businessAlerts = alertVoList.stream().map(alert -> {
             BusinessAlert businessAlert = new BusinessAlert();
+            alert.setCreateTime(new Date());
+            alert.setHandleType(BusinessStatusEnum.VERIFY.getStatus());
             BeanUtils.copyProperties(alert, businessAlert);
 
             return businessAlert;

dk-modules/business/src/main/java/org/dromara/business/utils/MinioUntil.java

@@ -0,0 +1,16 @@
+package org.dromara.business.utils;
+
+import org.dromara.common.oss.core.OssClient;
+import org.dromara.common.oss.factory.OssFactory;
+
+import java.net.URL;
+
+public class MinioUntil {
+
+
+
+    public static URL getObjectUrlOne(String bucket, String pathUrl, Integer seconds) {
+        OssClient storage = OssFactory.instance(bucket);
+        return storage.getPrivateUrlURL(pathUrl,seconds);
+    }
+}

dk-modules/business/src/main/java/org/dromara/business/utils/constants/MinIOConstants.java

@@ -0,0 +1,20 @@
+package org.dromara.business.utils.constants;
+
+import lombok.Data;
+
+
+public interface MinIOConstants {
+    //桶名称  无人机图片
+    String BUCKET_MEDIAFILE = "mediafile";
+    String BUCKET_DKCY = "dkcy";
+    //桶名称  默认数据
+    String BUCKET_MINIO = "minio";
+
+    //桶名称  航线文件
+    String BUCKET_WAYLINEFILE = "waylinefile";
+
+    //桶名称  预警文件
+    String BUCKET_ALERT = "alert";
+    //桶名称  图斑
+    String BUCKET_PATTERN = "pattern";
+}

dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java

@@ -1,7 +1,7 @@
 package org.dromara.sample;
 
 import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
-import org.mybatis.spring.annotation.MapperScan;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;

dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java

@@ -247,7 +247,7 @@ public class AiCompareServiceImpl implements IAiCompareService {
     @Override
     public Boolean commitAlert(List<Map<String, Object>> alertList) {
         List<RemoteStartProcess> startProcessList = alertList.stream().map(map -> {
-            String flowCode = remoteWorkflowService.getFlowCode(map.get("labelCn").toString());
+            String flowCode = remoteWorkflowService.getFlowCode(map.get("labelEn").toString());
             RemoteStartProcess remoteStartProcess = new RemoteStartProcess();
             remoteStartProcess.setBusinessId(map.get("id").toString());
             remoteStartProcess.setFlowCode(flowCode);