From 1634fabb32c65dd2221805e5b79356ec8ef607ca Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Mon, 31 Mar 2025 13:53:14 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[feat]=201=E3=80=81=E5=8F=96=E6=B6=88rocket?=
 =?UTF-8?q?mq=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dk-common/common-bus/pom.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dk-common/common-bus/pom.xml b/dk-common/common-bus/pom.xml
index 4a04b67..c0cfdf8 100644
--- a/dk-common/common-bus/pom.xml
+++ b/dk-common/common-bus/pom.xml
@@ -27,9 +27,14 @@
 <!--            <artifactId>spring-cloud-starter-bus-kafka</artifactId>-->
 <!--        </dependency>-->
         <!-- rocketmq -->
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-bus-rocketmq</artifactId>-->
+<!--        </dependency>-->
         <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-bus-rocketmq</artifactId>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-bus</artifactId>
+            <version>4.1.2</version>
         </dependency>
     </dependencies>
 </project>

From 6d5671719ea43dbbb9ddb25a6dd7613c80eb1c22 Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Mon, 31 Mar 2025 14:33:17 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1spring-cloud-bus=E9=85=8D=E7=BD=AE=202?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E9=A2=84=E8=AD=A6=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dk-common/common-bus/pom.xml                  |  2 +-
 .../mapper/business/BusinessAlertMapper.xml   | 40 +++++++++----------
 pom.xml                                       |  2 +
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/dk-common/common-bus/pom.xml b/dk-common/common-bus/pom.xml
index c0cfdf8..5d12802 100644
--- a/dk-common/common-bus/pom.xml
+++ b/dk-common/common-bus/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-bus</artifactId>
-            <version>4.1.2</version>
+            <version>${spring.cloud.bus.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
index b73248b..b32d8c9 100644
--- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
+++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
@@ -494,7 +494,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         dept_name AS root_dept_name,
         dept_id,
         dept_name
-        FROM dk_cloud.sys_dept
+        FROM
+        dk_cloud.sys_dept
         WHERE dept_id IN
         <foreach collection="deptIdList" item="deptId" open="(" separator="," close=")">
             #{deptId}
@@ -505,31 +506,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         dt.root_dept_name,
         d.dept_id,
         d.dept_name
-        FROM dk_cloud.sys_dept d
-        JOIN warning_summary dt
-        ON d.parent_id = dt.dept_id
-        WHERE d.del_flag = '0'
+        FROM
+        dk_cloud.sys_dept d
+        JOIN warning_summary dt ON d.parent_id = dt.dept_id
+        WHERE
+        d.del_flag = '0'
         )
         SELECT
-        root_dept_name deptName,
-        total
-        FROM (
-        SELECT
-        dt.root_dept_id,
-        dt.root_dept_name,
-        COUNT(ba.id) total
-        FROM business_alert ba
-        JOIN warning_summary dt
-        ON ba.dept_id = dt.dept_id
-        WHERE
-        1=1
+        ws.root_dept_name AS deptName,
+        IFNULL(COUNT(ba.id), 0) AS total
+        FROM
+        warning_summary ws
+        LEFT JOIN business_alert ba ON ws.dept_id = ba.dept_id
         and  <![CDATA[ DATE_FORMAT(ba.create_time, '%Y-%m-%d') >= #{startTime} ]]>
         and  <![CDATA[ DATE_FORMAT(ba.create_time, '%Y-%m-%d') <= #{endTime} ]]>
         <include refid="searchSql"></include>
-        GROUP BY dt.root_dept_id,dt.root_dept_name
-        ) dept_stats
-        ORDER BY total DESC
-        LIMIT 5;
+        GROUP BY
+        ws.root_dept_id,
+        ws.root_dept_name
+        ORDER BY
+        CASE WHEN total IS NULL THEN 1 ELSE 0 END,
+        total DESC
+        LIMIT 5
     </select>
 
     <select id="listAlert" resultType="org.dromara.business.domain.BusinessAlert">
diff --git a/pom.xml b/pom.xml
index 3d649ec..1753f24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,6 +78,8 @@
         <geotools.version>23.2</geotools.version>
         <!--PostgreSQL配置-->
         <postgresql.version>42.6.2</postgresql.version>
+
+        <spring.cloud.bus.version>4.1.2</spring.cloud.bus.version>
     </properties>
 
     <profiles>

From 47e7f1182520eedb3eabfad1e7f02239a5ffd823 Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Mon, 31 Mar 2025 15:49:51 +0800
Subject: [PATCH 3/4] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1spring-cloud-bus=E9=85=8D=E7=BD=AE=202?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E9=A2=84=E8=AD=A6=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BusinessAlertServiceImpl.java        |  3 +-
 .../BusinessAlertStatisticsServiceImpl.java   | 34 ++++---------------
 dk-modules/workflow/pom.xml                   |  5 +++
 .../common/constant/MinIOConstants.java       | 18 ++++++++++
 .../service/impl/FlwInstanceServiceImpl.java  | 13 +++++++
 .../dromara/workflow/utils/MinioUntil.java    | 14 ++++++++
 6 files changed, 59 insertions(+), 28 deletions(-)
 create mode 100644 dk-modules/workflow/src/main/java/org/dromara/workflow/common/constant/MinIOConstants.java
 create mode 100644 dk-modules/workflow/src/main/java/org/dromara/workflow/utils/MinioUntil.java

diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
index ad7c797..f291ecc 100644
--- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
+++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
@@ -300,7 +300,8 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
 
         if (ObjectUtil.isNotEmpty(bo.getPostCode())){
             //根据当前用户职能获取识别类型
-            List<RemoteAiLabelPostVo> postVoList = remoteLablePostService.selectLabelByList(bo.getPostCode(), LoginHelper.getDeptId());
+//            List<RemoteAiLabelPostVo> postVoList = remoteLablePostService.selectLabelByList(bo.getPostCode(), LoginHelper.getDeptId());
+            List<RemoteAiLabelPostVo> postVoList = remoteLablePostService.selectLabelByList(bo.getPostCode(), null);
 
             if (ObjectUtil.isEmpty(postVoList)) {
                 return null;
diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java
index 14dcade..5304f9f 100644
--- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java
+++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java
@@ -316,14 +316,11 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist
             return ListUtil.empty();
         }
 
-        AtomicInteger number = new AtomicInteger(1);
-
         postVoList.forEach(postVo -> {
             List<String> labelList = getAiLabel(postVo.getPostCode()).stream().map(RemoteAiLabelPostVo::getLabelEn).collect(Collectors.toList());
             businessAlertBo.setAiLabelEnList(labelList);
             Map<String, Object> dayMap = this.baseMapper.countCurrentDayAlert(businessAlertBo);
-            number.getAndIncrement();
-            result.add(new StatObj(postVo.getPostName(), ObjectUtil.isEmpty(dayMap.get("total"))? number.get() + 1:dayMap.get("total")));
+            result.add(new StatObj(postVo.getPostName(), dayMap.get("total")));
         });
 
         return result;
@@ -358,11 +355,7 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist
             endTime = dateMap.get("endTime");
         }
 
-        AtomicInteger number = new AtomicInteger(1);
-
         postVoList.forEach(postVo -> {
-            number.getAndIncrement();
-
             List<String> labelList = getAiLabel(postVo.getPostCode()).stream().map(RemoteAiLabelPostVo::getLabelEn).collect(Collectors.toList());
             Map<String, Object> dateMap = new HashMap<>();
             if (ObjectUtil.isEmpty(labelList)) {
@@ -375,8 +368,8 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist
 
             result.add(new StatObj(
                 postVo.getPostName(),
-                ObjectUtil.isEmpty(dateMap.get("todoCount"))?number.get() + 1:dateMap.get("todoCount"),
-                ObjectUtil.isEmpty(dateMap.get("finishCount"))?number.get() + 2:dateMap.get("finishCount")
+                dateMap.get("todoCount"),
+                dateMap.get("finishCount")
             ));
         });
 
@@ -409,29 +402,16 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist
 
             if (ObjectUtil.isEmpty(labelList)){
                 monthList.forEach(month -> {
-                    int randomValue = 90 + (int)(Math.random() * 31); // 90~120（含120）
-                    data.add(randomValue);
+                    data.add(0.0);
                 });
             }else {
                 businessAlertBo.setAiLabelEnList(labelList);
                 List<Map<String, Object>> rateList = baseMapper.handlerRate(businessAlertBo,monthList);
                 if (ObjectUtil.isNotEmpty(rateList)) {
-                    rateList.forEach(p->{
-                        if (ObjectUtil.isNotEmpty(p.get("avgInfo"))){
-                            data.add(p.get("avgInfo"));
-                        }else {
-                            int randomValue = 90 + (int)(Math.random() * 31);
-                            data.add(randomValue);
-                        }
-                    });
-//                    data.addAll(rateList.stream().map(p-> p.get("avgInfo")).toList());
+                  data.addAll(rateList.stream().map(p-> p.get("avgInfo")).toList());
                 }else {
-//                    monthList.forEach(month -> {
-//                        data.add(0.0);
-//                    });
                     monthList.forEach(month -> {
-                        int randomValue = 90 + (int)(Math.random() * 31);
-                        data.add(randomValue);
+                        data.add(0.0);
                     });
                 }
             }
@@ -696,6 +676,6 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist
     }
 
     private List<RemoteAiLabelPostVo> getAiLabel(String postCode) {
-        return remoteLabelPostService.selectLabelByList(postCode,LoginHelper.getDeptId());
+        return remoteLabelPostService.selectLabelByList(postCode,null);
     }
 }
diff --git a/dk-modules/workflow/pom.xml b/dk-modules/workflow/pom.xml
index f9235ac..c0160e2 100644
--- a/dk-modules/workflow/pom.xml
+++ b/dk-modules/workflow/pom.xml
@@ -54,6 +54,11 @@
             <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-idempotent</artifactId>
diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/common/constant/MinIOConstants.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/common/constant/MinIOConstants.java
new file mode 100644
index 0000000..eff025a
--- /dev/null
+++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/common/constant/MinIOConstants.java
@@ -0,0 +1,18 @@
+package org.dromara.workflow.common.constant;
+
+
+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";
+}
diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
index 3e5152c..16d1831 100644
--- a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
+++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
@@ -36,6 +36,7 @@ import org.dromara.warm.flow.orm.entity.FlowTask;
 import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper;
 import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper;
 import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.constant.MinIOConstants;
 import org.dromara.workflow.common.enums.TaskStatusEnum;
 import org.dromara.workflow.domain.bo.FlowCancelBo;
 import org.dromara.workflow.domain.bo.FlowInstanceBo;
@@ -48,6 +49,7 @@ import org.dromara.workflow.mapper.FlwCategoryMapper;
 import org.dromara.workflow.mapper.FlwInstanceMapper;
 import org.dromara.workflow.service.IFlwInstanceService;
 import org.dromara.workflow.service.IFlwTaskService;
+import org.dromara.workflow.utils.MinioUntil;
 import org.dromara.workflow.utils.WorkflowUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -322,6 +324,17 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
             list.addAll(BeanUtil.copyToList(flowHisTasks, FlowHisTaskVo.class));
         }
         String flowChart = chartService.chartIns(instanceId);
+        list.forEach(flowHisTaskVo -> {
+           if (ObjectUtil.isNotNull(flowHisTaskVo.getExt())) {
+               String[] extArr = flowHisTaskVo.getExt().split(",");
+               StringBuilder sb = new StringBuilder();
+               Arrays.asList(extArr).forEach(ext->{
+                   sb.append(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_MINIO, ext, 3600).toString()).append(",");
+               });
+               flowHisTaskVo.setExt(sb.toString());
+           }
+        });
+
         return Map.of("list", list, "image", flowChart);
     }
 
diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/utils/MinioUntil.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/utils/MinioUntil.java
new file mode 100644
index 0000000..3c90e18
--- /dev/null
+++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/utils/MinioUntil.java
@@ -0,0 +1,14 @@
+package org.dromara.workflow.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);
+    }
+}

From b4681b444566e5ad551c101c7737b915d0edfcfb Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Mon, 31 Mar 2025 16:21:48 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6=E6=98=BE=E7=A4=BA=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E8=BF=9E=E6=8E=A5=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/api/domain/RemoteFile.java       |  5 ++++
 .../service/impl/FlwInstanceServiceImpl.java  | 23 ++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/dk-api/api-resource/src/main/java/org/dromara/resource/api/domain/RemoteFile.java b/dk-api/api-resource/src/main/java/org/dromara/resource/api/domain/RemoteFile.java
index 7140fe6..6c4360e 100644
--- a/dk-api/api-resource/src/main/java/org/dromara/resource/api/domain/RemoteFile.java
+++ b/dk-api/api-resource/src/main/java/org/dromara/resource/api/domain/RemoteFile.java
@@ -41,4 +41,9 @@ public class RemoteFile implements Serializable {
      */
     private String fileSuffix;
 
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
 }
diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
index 16d1831..f9fa99c 100644
--- a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
+++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.core.enums.BusinessStatusEnum;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.StreamUtils;
@@ -18,6 +19,8 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.resource.api.RemoteFileService;
+import org.dromara.resource.api.domain.RemoteFile;
 import org.dromara.system.api.domain.vo.RemoteUserVo;
 import org.dromara.warm.flow.core.FlowEngine;
 import org.dromara.warm.flow.core.constant.ExceptionCons;
@@ -78,6 +81,8 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
     private final IFlwTaskService flwTaskService;
     private final FlwInstanceMapper flwInstanceMapper;
     private final FlwCategoryMapper flwCategoryMapper;
+    @DubboReference
+    private RemoteFileService remoteFileService;
 
     /**
      * 分页查询正在运行的流程实例
@@ -326,12 +331,18 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
         String flowChart = chartService.chartIns(instanceId);
         list.forEach(flowHisTaskVo -> {
            if (ObjectUtil.isNotNull(flowHisTaskVo.getExt())) {
-               String[] extArr = flowHisTaskVo.getExt().split(",");
-               StringBuilder sb = new StringBuilder();
-               Arrays.asList(extArr).forEach(ext->{
-                   sb.append(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_MINIO, ext, 3600).toString()).append(",");
-               });
-               flowHisTaskVo.setExt(sb.toString());
+               try {
+                   String[] extArr = flowHisTaskVo.getExt().split(",");
+                   StringBuilder sb = new StringBuilder();
+
+                   Arrays.asList(extArr).forEach(ext->{
+                       List<RemoteFile> remoteFiles = remoteFileService.selectByIds(ext);
+                       sb.append(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_MINIO, remoteFiles.get(0).getFileName(), 3600).toString()).append(",");
+                   });
+                   flowHisTaskVo.setExt(sb.toString());
+               } catch (Exception e) {
+                   log.error("获取: {}", e.getMessage(), e);
+               }
            }
         });