新增刷新按钮

2026-05-03 17:39:55 +08:00 · 2025-09-27 19:01:50 +08:00
parent a1e0a09320
commit 2a2fd21bdb
20 changed files with 226 additions and 80 deletions
--- a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/GunController.java
+++ b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/GunController.java
@@ -82,7 +82,7 @@ public class GunController extends BaseController {
            // 通过AttributeService获取充电枪运行状态
            ListenableFuture<Optional<AttributeKvEntry>> attributeFuture =
                    attributeService.find(gun.getId(), AttrKeyEnum.GUN_RUN_STATUS.getCode());
-
+            
            Optional<AttributeKvEntry> attributeResult = attributeFuture.get();
            String status = null;
            if (attributeResult.isPresent()) {
--- a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/PileController.java
+++ b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/PileController.java
@@ -94,7 +94,7 @@ public class PileController extends BaseController {
            // 通过AttributeService获取充电桩状态
            ListenableFuture<Optional<AttributeKvEntry>> attributeFuture =
                    attributeService.find(pile.getId(), AttrKeyEnum.STATUS.getCode());
-
+            
            Optional<AttributeKvEntry> attributeResult = attributeFuture.get();
            String status = null;
            if (attributeResult.isPresent()) {
--- a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/RpcController.java
+++ b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/RpcController.java
@@ -23,7 +23,7 @@ import sanbing.jcpp.proto.gen.DownlinkProto.*;

 /**
 * RPC控制器 - 通用化的充电桩下行指令接口
- *
+ * 
 * @author 九筒
 */
@RestController
@@ -156,7 +156,7 @@ public class RpcController extends BaseController {
    /**
     * 处理离线卡余额更新指令
     */
-    private void handleOfflineCardBalanceUpdate(JsonNode parameter) {
+    private void handleOfflineCardBalanceUpdate(JsonNode parameter) throws Exception {
        OfflineCardBalanceUpdateRequest request = JacksonUtil.fromJson(parameter, OfflineCardBalanceUpdateRequest.class);
        pileProtocolService.offlineCardBalanceUpdateRequest(request);
    }
--- a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/dto/RestartPileDTO.java
+++ b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/dto/RestartPileDTO.java
@@ -12,7 +12,7 @@ import lombok.Data;

 /**
 * 重启充电桩DTO
- *
+ * 
 * @author 九筒
 */
@Data
--- a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/dto/SetPricingDTO.java
+++ b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/dto/SetPricingDTO.java
@@ -13,7 +13,7 @@ import sanbing.jcpp.proto.gen.DownlinkProto.SetPricingRequest;

 /**
 * 设置计费策略DTO
- *
+ * 
 * @author 九筒
 */
@Data
--- a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/dto/StartChargeDTO.java
+++ b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/dto/StartChargeDTO.java
@@ -14,7 +14,7 @@ import java.math.BigDecimal;

 /**
 * 启动充电DTO
- *
+ * 
 * @author 九筒
 */
@Data
--- a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/dto/StopChargeDTO.java
+++ b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/dto/StopChargeDTO.java
@@ -11,7 +11,7 @@ import lombok.Data;

 /**
 * 停止充电DTO
- *
+ * 
 * @author 九筒
 */
@Data
--- a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/dto/TimeSyncDTO.java
+++ b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/dto/TimeSyncDTO.java
@@ -14,7 +14,7 @@ import java.time.LocalDateTime;

 /**
 * 时间同步DTO
- *
+ * 
 * @author 九筒
 */
@Data
--- a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/request/RpcRequest.java
+++ b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/request/RpcRequest.java
@@ -13,7 +13,7 @@ import lombok.Data;

 /**
 * RPC请求参数
- *
+ * 
 * @author 九筒
 */
@Data
--- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultGunService.java
+++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultGunService.java
@@ -198,7 +198,7 @@ public class DefaultGunService implements GunService {
                // 保存充电枪状态到属性表
                saveGunStatusChange(gun.getId(), dbStatus.name(), ts);

-                log.info("充电枪状态更新成功: 桩编码={}, 枪编号={}, 原状态={}, 新状态={}",
+                log.info("充电枪状态更新成功: 桩编码={}, 枪编号={}, 原状态={}, 新状态={}", 
                        pileCode, gunNo, currentStatus, dbStatus);
                
                // 根据充电枪状态判断是否需要更新充电桩状态
--- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java
+++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java
@@ -630,7 +630,7 @@ public class DefaultPileProtocolService implements PileProtocolService {
        String additionalInfo = bmsHandshakeProto.getAdditionalInfo();
        
        log.info("BMS充电握手信息: 交易流水号: {}, 桩编码: {}, 枪号: {}, 车辆VIN: {}, BMS协议版本: {}, " +
-                "电池类型: {}, 电池容量: {}Ah, 附加信息: {}",
+                        "电池类型: {}, 电池容量: {}Ah, 附加信息: {}",
                tradeNo, pileCode, gunNo, carVinCode, bmsProtocolVersion, 
                bmsBatteryType, bmsPowerCapacity, additionalInfo);
        
--- a/jcpp-app/src/main/resources/mapper/GunMapper.xml
+++ b/jcpp-app/src/main/resources/mapper/GunMapper.xml
@@ -101,8 +101,8 @@

    <!-- 根据充电桩编码和充电枪编号查询充电枪 -->
    <select id="selectByPileCodeAndGunNo" resultType="sanbing.jcpp.app.dal.entity.Gun">
-        SELECT g.* FROM t_gun g 
-        INNER JOIN t_pile p ON g.pile_id = p.id
+        SELECT g.* FROM t_gun g
+                            INNER JOIN t_pile p ON g.pile_id = p.id
        WHERE p.pile_code = #{pileCode}
          AND g.gun_no = #{gunNo}
    </select>
@@ -139,8 +139,8 @@
        <!-- 状态相关属性 -->
        a_run_status.str_v as run_status

-        FROM t_gun g
-
+        FROM t_gun g 
+        
        <!-- LEFT JOIN 获取充电站信息 -->
        LEFT JOIN t_station s ON g.station_id = s.id

--- a/jcpp-app/src/main/resources/mapper/PileMapper.xml
+++ b/jcpp-app/src/main/resources/mapper/PileMapper.xml
@@ -36,9 +36,9 @@

        <!-- 充电枪数量 - 使用LEFT JOIN优化子查询 -->
        COALESCE(g.gun_count, 0) as gun_count
-            
-        FROM t_pile p

+        FROM t_pile p 
+        
        <!-- 单次JOIN获取所有属性，避免多次JOIN -->
        LEFT JOIN t_attr a ON (
        a.entity_id = p.id AND
--- a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340HeartbeatULCmd.java
+++ b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340HeartbeatULCmd.java
@@ -54,7 +54,7 @@ public class LvnengV340HeartbeatULCmd extends LvnengUplinkCmdExe {
        //5预留
        byteBuf.skipBytes(16);

-
+        // 会话添加充电桩编码
        tcpSession.addPileCode(pileCode);

        // 注册前置会话
--- a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340RealTimeDataULCmd.java
+++ b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340RealTimeDataULCmd.java
@@ -219,7 +219,7 @@ public class LvnengV340RealTimeDataULCmd extends LvnengUplinkCmdExe {
        //46 预留 1
        byteBuf.skipBytes(1);

-
+        // 会话添加充电桩编码
        tcpSession.addPileCode(pileCode);

        // 注册前置会话
--- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RealTimeDataULCmd.java
+++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RealTimeDataULCmd.java
@@ -140,6 +140,12 @@ public class YunKuaiChongV150RealTimeDataULCmd extends YunKuaiChongUplinkCmdExe
                .addAllFaultMessages(faults)
                .setAdditionalInfo(additionalInfo.toString());

+        // 会话添加充电桩编码
+        tcpSession.addPileCode(pileCode);
+
+        // 注册前置会话
+        ctx.getProtocolSessionRegistryProvider().register(tcpSession);
+
        // 转发到后端
        UplinkQueueMessage gunRunStatusMessage = uplinkMessageBuilder(pileCode, tcpSession, yunKuaiChongUplinkMessage)
                .setGunRunStatusProto(gunRunStatusProtoBuilder)
--- a/jcpp-web-ui/src/components/GunDebug.tsx
+++ b/jcpp-web-ui/src/components/GunDebug.tsx
@@ -7,7 +7,7 @@
 import React, {useEffect, useState} from 'react';
 import {useNavigate, useParams, useSearchParams} from 'react-router-dom';
 import {Alert, Breadcrumb, Button, Card, Descriptions, Divider, message, Space, Spin, Typography} from 'antd';
-import {ArrowLeftOutlined, BugOutlined, HomeOutlined, PlayCircleOutlined} from '@ant-design/icons';
+import {ArrowLeftOutlined, BugOutlined, CopyOutlined, HomeOutlined, PlayCircleOutlined} from '@ant-design/icons';
 import {Gun} from '../types';
 import * as gunService from '../services/gunService';
 import {api, getErrorMessage} from '../services/api';
@@ -91,6 +91,47 @@ const GunDebug: React.FC = () => {
        navigate(returnUrl);
    };

+    // 获取完整的请求头信息（类似Swagger）
+    const getCompleteHeaders = () => {
+        const token = localStorage.getItem('token');
+        const headers: Record<string, string> = {
+            'Accept': 'application/json;charset=UTF-8',
+            'Content-Type': 'application/json;charset=UTF-8',
+        };
+
+        if (token) {
+            headers['Authorization'] = `Bearer ${token}`;
+        }
+
+        return headers;
+    };
+
+    // 生成curl命令（类似Swagger UI）
+    const generateCurlCommand = (url: string, method: string, headers: Record<string, string>, requestBody: any) => {
+        let curlCommand = `curl -X ${method} "${url}"`;
+
+        // 添加请求头
+        Object.entries(headers).forEach(([key, value]) => {
+            curlCommand += ` \\\n  -H "${key}: ${value}"`;
+        });
+
+        // 添加请求体（如果有）
+        if (requestBody && method !== 'GET') {
+            curlCommand += ` \\\n  -d '${JSON.stringify(requestBody)}'`;
+        }
+
+        return curlCommand;
+    };
+
+    // 复制curl命令到剪贴板
+    const copyCurlCommand = (curlCommand: string) => {
+        navigator.clipboard.writeText(curlCommand).then(() => {
+            message.success('cURL命令已复制到剪贴板');
+        }).catch(() => {
+            message.error('复制失败，请手动复制');
+        });
+    };
+
    // 执行充电枪状态查询调试
    const handleDebugGunStatus = async () => {
        if (!gun) return;
@@ -98,16 +139,16 @@ const GunDebug: React.FC = () => {
        // 清除充电桩调试结果，只显示充电枪调试结果
        setPileDebugResult(null);
        setDebugLoading(true);
-        try {
-            const headers = {
-                'Content-Type': 'application/json',
-            };

+        const fullUrl = `${api.defaults.baseURL}/api/guns/status/${gun.gunCode}`;
+        const headers = getCompleteHeaders();
+
+        try {
            // 直接调用现有的正确API接口
            const response = await api.get(`/api/guns/status/${gun.gunCode}`);

            setDebugResult({
-                url: `/api/guns/status/${gun.gunCode}`,
+                url: fullUrl,
                method: 'GET',
                headers,
                requestBody: null,
@@ -123,9 +164,9 @@ const GunDebug: React.FC = () => {
            }
        } catch (error: any) {
            const errorResult = {
-                url: `/api/guns/status/${gun.gunCode}`,
+                url: fullUrl,
                method: 'GET',
-                headers: {'Content-Type': 'application/json'},
+                headers,
                requestBody: null,
                response: {success: false, message: getErrorMessage(error)},
                timestamp: new Date().toLocaleString(),
@@ -149,16 +190,16 @@ const GunDebug: React.FC = () => {
        // 清除充电枪调试结果，只显示充电桩调试结果
        setDebugResult(null);
        setPileDebugLoading(true);
-        try {
-            const headers = {
-                'Content-Type': 'application/json',
-            };

+        const fullUrl = `${api.defaults.baseURL}/api/piles/status/${gun.pileCode}`;
+        const headers = getCompleteHeaders();
+
+        try {
            // 直接调用现有的正确API接口
            const response = await api.get(`/api/piles/status/${gun.pileCode}`);

            setPileDebugResult({
-                url: `/api/piles/status/${gun.pileCode}`,
+                url: fullUrl,
                method: 'GET',
                headers,
                requestBody: null,
@@ -174,9 +215,9 @@ const GunDebug: React.FC = () => {
            }
        } catch (error: any) {
            const errorResult = {
-                url: `/api/piles/status/${gun.pileCode}`,
+                url: fullUrl,
                method: 'GET',
-                headers: {'Content-Type': 'application/json'},
+                headers,
                requestBody: null,
                response: {success: false, message: getErrorMessage(error)},
                timestamp: new Date().toLocaleString(),
@@ -302,6 +343,30 @@ const GunDebug: React.FC = () => {
                            </Descriptions.Item>
                        </Descriptions>

+                        <Divider orientation="left">
+                            cURL 命令
+                            <Button
+                                type="link"
+                                size="small"
+                                icon={<CopyOutlined/>}
+                                onClick={() => copyCurlCommand(generateCurlCommand(debugResult.url, debugResult.method, debugResult.headers, debugResult.requestBody))}
+                                style={{marginLeft: 8}}
+                            >
+                                复制
+                            </Button>
+                        </Divider>
+                        <pre style={{
+                            background: '#1f1f1f',
+                            color: '#f8f8f2',
+                            padding: 12,
+                            borderRadius: 4,
+                            fontSize: 12,
+                            overflow: 'auto',
+                            fontFamily: 'Monaco, Menlo, "Ubuntu Mono", monospace'
+                        }}>
+              {generateCurlCommand(debugResult.url, debugResult.method, debugResult.headers, debugResult.requestBody)}
+            </pre>
+
                        <Divider orientation="left">请求头 (Headers)</Divider>
                        <pre style={{
                            background: '#f5f5f5',
@@ -321,7 +386,7 @@ const GunDebug: React.FC = () => {
                            fontSize: 12,
                            overflow: 'auto'
                        }}>
-              {JSON.stringify(debugResult.requestBody, null, 2)}
+              {debugResult.requestBody ? JSON.stringify(debugResult.requestBody, null, 2) : 'null'}
            </pre>

                        <Divider orientation="left">响应结果 (Response)</Divider>
@@ -361,6 +426,30 @@ const GunDebug: React.FC = () => {
                            </Descriptions.Item>
                        </Descriptions>

+                        <Divider orientation="left">
+                            cURL 命令
+                            <Button
+                                type="link"
+                                size="small"
+                                icon={<CopyOutlined/>}
+                                onClick={() => copyCurlCommand(generateCurlCommand(pileDebugResult.url, pileDebugResult.method, pileDebugResult.headers, pileDebugResult.requestBody))}
+                                style={{marginLeft: 8}}
+                            >
+                                复制
+                            </Button>
+                        </Divider>
+                        <pre style={{
+                            background: '#1f1f1f',
+                            color: '#f8f8f2',
+                            padding: 12,
+                            borderRadius: 4,
+                            fontSize: 12,
+                            overflow: 'auto',
+                            fontFamily: 'Monaco, Menlo, "Ubuntu Mono", monospace'
+                        }}>
+              {generateCurlCommand(pileDebugResult.url, pileDebugResult.method, pileDebugResult.headers, pileDebugResult.requestBody)}
+            </pre>
+
                        <Divider orientation="left">请求头 (Headers)</Divider>
                        <pre style={{
                            background: '#f5f5f5',
@@ -380,7 +469,7 @@ const GunDebug: React.FC = () => {
                            fontSize: 12,
                            overflow: 'auto'
                        }}>
-              {JSON.stringify(pileDebugResult.requestBody, null, 2)}
+              {pileDebugResult.requestBody ? JSON.stringify(pileDebugResult.requestBody, null, 2) : 'null'}
            </pre>

                        <Divider orientation="left">响应结果 (Response)</Divider>
--- a/jcpp-web-ui/src/components/GunManagement.tsx
+++ b/jcpp-web-ui/src/components/GunManagement.tsx
@@ -597,6 +597,13 @@ const GunManagement: React.FC = () => {
      updateSearchParams(newParams);
  };

+    // 刷新数据
+    const handleRefresh = () => {
+        // 使用当前的搜索参数重新加载数据
+        updateSearchParams({...searchParams});
+        setSelectedRowKeys([]);
+    };
+
  // 显示新建模态框
  const showCreateModal = () => {
    setIsEdit(false);
@@ -942,20 +949,30 @@ const GunManagement: React.FC = () => {
      <Card
        title="充电枪列表"
        extra={
-          <Dropdown 
-            menu={columnSelectorMenu} 
-            placement="bottomRight" 
-            trigger={['click']}
-            overlayStyle={{ minWidth: 180 }}
-          >
-            <Button 
-              icon={<TableOutlined />} 
-              type="text" 
-              size="small"
-              style={{ padding: '4px 8px' }}
-              title="自定义列"
-            />
-          </Dropdown>
+            <Space size="small">
+                <Button
+                    icon={<ReloadOutlined/>}
+                    type="text"
+                    size="small"
+                    style={{padding: '4px 8px'}}
+                    title="刷新数据"
+                    onClick={handleRefresh}
+                />
+                <Dropdown
+                    menu={columnSelectorMenu}
+                    placement="bottomRight"
+                    trigger={['click']}
+                    overlayStyle={{minWidth: 180}}
+                >
+                    <Button
+                        icon={<TableOutlined/>}
+                        type="text"
+                        size="small"
+                        style={{padding: '4px 8px'}}
+                        title="自定义列"
+                    />
+                </Dropdown>
+            </Space>
        }
      >
        <Table
--- a/jcpp-web-ui/src/components/PileManagement.tsx
+++ b/jcpp-web-ui/src/components/PileManagement.tsx
@@ -23,7 +23,7 @@ import {
    Tag,
    Typography
 } from 'antd';
-import {DeleteOutlined, PlusOutlined, TableOutlined} from '@ant-design/icons';
+import {DeleteOutlined, PlusOutlined, ReloadOutlined, TableOutlined} from '@ant-design/icons';
 import type {ColumnsType, TableProps} from 'antd/es/table';
 import {pileService} from '../services/pileService';
 import * as stationService from '../services/stationService';
@@ -585,6 +585,13 @@ const PileManagement: React.FC = () => {
    setSearchParams(newParams);
  };

+    // 刷新数据
+    const handleRefresh = () => {
+        // 使用当前的搜索参数重新加载数据
+        setSearchParams({...searchParams});
+        setSelectedRowKeys([]);
+    };
+
  // 显示新建Modal
  const showCreateModal = async () => {
    form.resetFields();
@@ -969,20 +976,30 @@ const PileManagement: React.FC = () => {
      <Card
        title="充电桩列表"
        extra={
-          <Dropdown 
-            menu={columnSelectorMenu} 
-            placement="bottomRight" 
-            trigger={['click']}
-            overlayStyle={{ minWidth: 180 }}
-          >
-            <Button 
-              icon={<TableOutlined />} 
-              type="text" 
-              size="small"
-              style={{ padding: '4px 8px' }}
-              title="自定义列"
-            />
-          </Dropdown>
+            <Space size="small">
+                <Button
+                    icon={<ReloadOutlined/>}
+                    type="text"
+                    size="small"
+                    style={{padding: '4px 8px'}}
+                    title="刷新数据"
+                    onClick={handleRefresh}
+                />
+                <Dropdown
+                    menu={columnSelectorMenu}
+                    placement="bottomRight"
+                    trigger={['click']}
+                    overlayStyle={{minWidth: 180}}
+                >
+                    <Button
+                        icon={<TableOutlined/>}
+                        type="text"
+                        size="small"
+                        style={{padding: '4px 8px'}}
+                        title="自定义列"
+                    />
+                </Dropdown>
+            </Space>
        }
      >
        <Table
--- a/jcpp-web-ui/src/components/StationManagement.tsx
+++ b/jcpp-web-ui/src/components/StationManagement.tsx
@@ -505,6 +505,13 @@ const StationManagement: React.FC = () => {
    setSearchParams(newParams);
  };

+    // 刷新数据
+    const handleRefresh = () => {
+        // 使用当前的搜索参数重新加载数据
+        setSearchParams({...searchParams});
+        setSelectedRowKeys([]);
+    };
+
  // 显示创建模态框
  const showCreateModal = () => {
    setIsEdit(false);
@@ -929,20 +936,30 @@ const StationManagement: React.FC = () => {
      <Card
        title="充电站列表"
        extra={
-          <Dropdown 
-            menu={columnSelectorMenu} 
-            placement="bottomRight" 
-            trigger={['click']}
-            overlayStyle={{ minWidth: 180 }}
-          >
-            <Button 
-              icon={<TableOutlined />} 
-              type="text" 
-              size="small"
-              style={{ padding: '4px 8px' }}
-              title="自定义列"
-            />
-          </Dropdown>
+            <Space size="small">
+                <Button
+                    icon={<ReloadOutlined/>}
+                    type="text"
+                    size="small"
+                    style={{padding: '4px 8px'}}
+                    title="刷新数据"
+                    onClick={handleRefresh}
+                />
+                <Dropdown
+                    menu={columnSelectorMenu}
+                    placement="bottomRight"
+                    trigger={['click']}
+                    overlayStyle={{minWidth: 180}}
+                >
+                    <Button
+                        icon={<TableOutlined/>}
+                        type="text"
+                        size="small"
+                        style={{padding: '4px 8px'}}
+                        title="自定义列"
+                    />
+                </Dropdown>
+            </Space>
        }
      >
        <Table