From d4daacdf04233c0647eb4b87c8e71e55b39e5ebb Mon Sep 17 00:00:00 2001
From: zhaoxianglong <you@example.com>
Date: Thu, 30 May 2024 18:21:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/business/StatusMapper.xml    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/zc-business/src/main/resources/mapper/business/StatusMapper.xml b/zc-business/src/main/resources/mapper/business/StatusMapper.xml
index fec5456d..06fe274b 100644
--- a/zc-business/src/main/resources/mapper/business/StatusMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/StatusMapper.xml
@@ -121,6 +121,9 @@
                 AND d.use_state = #{status.useState}
             </if>
         </where>
+        <if test="status.orderByField != null and status.orderDirection != null">
+            ORDER BY ${status.orderByField} ${status.orderDirection}
+        </if>
     </select>
 
 
@@ -185,6 +188,9 @@
                 AND d.use_state = #{status.useState}
             </if>
         </where>
+        <if test="status.orderByField != null and status.orderDirection != null">
+            ORDER BY ${status.orderByField} ${status.orderDirection}
+        </if>
     </select>
 
 
@@ -222,6 +228,9 @@
             d.device_type,
             DAY (s.time)
         </where>
+        <if test="status.orderByField != null and status.orderDirection != null">
+            ORDER BY ${status.orderByField} ${status.orderDirection}
+        </if>
     </select>
 
 
@@ -251,6 +260,9 @@
                 AND d.use_state = #{status.useState}
             </if>
         </where>
+        <if test="status.orderByField != null and status.orderDirection != null">
+            ORDER BY ${status.orderByField} ${status.orderDirection}
+        </if>
     </select>
 
     <select id="deviceStatusListById" parameterType="com.zc.business.domain.Status" resultMap="BaseResultMap">
@@ -264,6 +276,9 @@
                 AND s.device_id = #{status.deviceId}
             </if>
         </where>
+        <if test="status.orderByField != null and status.orderDirection != null">
+            ORDER BY ${status.orderByField} ${status.orderDirection}
+        </if>
     </select>
 
 </mapper>

From 9b141fcc28d8e89640a4f164f334e6d950a13634 Mon Sep 17 00:00:00 2001
From: "Mr.Wang" <wang@qq.com>
Date: Thu, 30 May 2024 19:01:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ModuleCallServiceImpl.java      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/service/impl/ModuleCallServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/ModuleCallServiceImpl.java
index b76b49e7..9d5e2cf6 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/ModuleCallServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/ModuleCallServiceImpl.java
@@ -14,14 +14,14 @@ import java.util.*;
 @Service
 public class ModuleCallServiceImpl implements ModuleCallService {
 
-    private static long ROAD_SECTION_PERCEPTION; // 路段感知
-    private static long ROAD_NETWORK_CONTROL; // 路网管控
-    private static long MAINTENANCE_AND_OPERATION; // 养护运营
-    private static long PUBLIC_SERVICES; // 公众服务
-    private static long SCAN_CODE_ALARM; // 扫码报警
-    private static long NON_AIRCRAFT_WARNING; // 非机预警
-    private static long GIS_BIM; // gisBim
-    private static long DIGITAL_TOLL_STATION; // 数字收费站
+    private static long ROAD_SECTION_PERCEPTION = 14; // 路段感知
+    private static long ROAD_NETWORK_CONTROL = 23; // 路网管控
+    private static long MAINTENANCE_AND_OPERATION = 21; // 养护运营
+    private static long PUBLIC_SERVICES = 25; // 公众服务
+    private static long SCAN_CODE_ALARM = 11; // 扫码报警
+    private static long NON_AIRCRAFT_WARNING = 6; // 非机预警
+    private static long GIS_BIM = 22; // gisBim
+    private static long DIGITAL_TOLL_STATION = 12; // 数字收费站
 
     @Resource
     private RedisCache redisCache;

From e73fdf09cf6a5ec350c2f7c2025571ee90fac180 Mon Sep 17 00:00:00 2001
From: zhaoxianglong <you@example.com>
Date: Thu, 30 May 2024 19:38:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96status=E8=A1=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/zc/business/controller/StatusController.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zc-business/src/main/java/com/zc/business/controller/StatusController.java b/zc-business/src/main/java/com/zc/business/controller/StatusController.java
index 3b29fe92..d12339f0 100644
--- a/zc-business/src/main/java/com/zc/business/controller/StatusController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/StatusController.java
@@ -67,6 +67,7 @@ public class StatusController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, Status status)
     {
+        status.setTypes(status.getType().split(","));
         List<Status> listStatus = statusService.export(status);
         ExcelUtil<Status> util = new ExcelUtil<>(Status.class);
         util.exportExcel(response, listStatus, "设备状态列表");