Merge remote-tracking branch 'origin/develop' into develop

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, "设备状态列表");

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;

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>