Merge branch 'dev-new' into dev

2026-07-12 01:58:00 +08:00 · 2025-01-08 08:30:41 +08:00
parent 01ede2fbf1 351e03d4e8
commit 09b0022158
8 changed files with 748 additions and 682 deletions
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java
@@ -14,7 +14,6 @@ import com.jsowell.common.response.RestApiResponse;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.common.util.poi.ExcelUtil;
 import com.jsowell.pile.domain.PileStationInfo;
-import com.jsowell.pile.domain.ThirdPartySettingInfo;
 import com.jsowell.pile.domain.ThirdpartyParkingConfig;
 import com.jsowell.pile.dto.FastCreateStationDTO;
 import com.jsowell.pile.dto.PushStationInfoDTO;
@@ -147,6 +146,7 @@ public class PileStationInfoController extends BaseController {

    /**
     * 后管站点基本资料页面
+     *
     * @return
     */
    @PreAuthorize("@ss.hasPermi('pile:station:query')")
@@ -189,6 +189,7 @@ public class PileStationInfoController extends BaseController {

    /**
     * 高德地图商家推送静态信息状态
+     *
     * @param dto
     * @return
     */
@@ -229,6 +230,7 @@ public class PileStationInfoController extends BaseController {

    /**
     * 修改站点二维码前缀
+     *
     * @param dto
     * @return
     */
@@ -244,6 +246,7 @@ public class PileStationInfoController extends BaseController {

    /**
     * 查询站点互联互通配置
+     *
     * @param id
     * @return
     */
@@ -262,13 +265,13 @@ public class PileStationInfoController extends BaseController {
     * @param info
     * @return
     */
-	@PreAuthorize("@ss.hasPermi('pile:station:query')")
-	@PostMapping("/getSettingInfo")
-	public TableDataInfo getSettingInfo(@RequestBody ThirdPartySettingInfo info) {
-		List<ThirdPartySettingInfo> infos = thirdPartySettingInfoService.selectThirdPartySettingInfoList(info);
-		return getDataTable(infos);
-		// return AjaxResult.success(thirdPartySettingInfoService.selectSettingInfo(info));
-	}
+    // @PreAuthorize("@ss.hasPermi('pile:station:query')")
+    // @PostMapping("/getSettingInfo")
+    // public TableDataInfo getSettingInfo(@RequestBody ThirdPartySettingInfo info) {
+    // 	List<ThirdPartySettingInfo> infos = thirdPartySettingInfoService.selectThirdPartySettingInfoList(info);
+    // 	return getDataTable(infos);
+    // 	// return AjaxResult.success(thirdPartySettingInfoService.selectSettingInfo(info));
+    // }

    /**
     * 修改站点互联互通配置信息
@@ -293,10 +296,10 @@ public class PileStationInfoController extends BaseController {
    // }


-
    /**
     * 推送充电站信息 notification_stationInfo
     * http://localhost:8080/LianLian/pushStationInfo
+     *
     * @param dto
     * @return
     */
@@ -320,10 +323,10 @@ public class PileStationInfoController extends BaseController {
            }
            String result = commonService.commonPushStation(dto);
            response = new RestApiResponse<>(result);
-		}catch (BusinessException e) {
-			logger.error("推送第三方平台充电站信息 error",e);
+        } catch (BusinessException e) {
+            logger.error("推送第三方平台充电站信息 error", e);
            response = new RestApiResponse<>(e.getCode(), e.getMessage());
-		}catch (Exception e) {
+        } catch (Exception e) {
            logger.error("推送第三方平台充电站信息 error", e);
            response = new RestApiResponse<>("推送失败，请联系管理员");
            // 有报错，所有的都必须删除
@@ -335,6 +338,7 @@ public class PileStationInfoController extends BaseController {

    /**
     * 绑定停车平台（停车充电下发优惠券）
+     *
     * @param dto
     * @return
     */
@@ -345,7 +349,7 @@ public class PileStationInfoController extends BaseController {
        try {
            int i = pileStationInfoService.bindParkingPlatform(dto);
            response = new RestApiResponse<>(i);
-		}catch (BusinessException e) {
+        } catch (BusinessException e) {
            logger.error("绑定停车平台 error,", e);
            response = new RestApiResponse<>(e.getCode(), e.getMessage());
        } catch (Exception e) {
@@ -358,6 +362,7 @@ public class PileStationInfoController extends BaseController {

    /**
     * 获取停车平台列表
+     *
     * @return
     */
    @GetMapping("/getParkingInfoList")
--- a/jsowell-common/src/main/java/com/jsowell/common/core/domain/parking/ParkingCommonParam.java
+++ b/jsowell-common/src/main/java/com/jsowell/common/core/domain/parking/ParkingCommonParam.java
@@ -2,6 +2,7 @@ package com.jsowell.common.core.domain.parking;

 import lombok.Data;

+import java.util.HashMap;
 import java.util.Map;

 /**
@@ -38,4 +39,13 @@ public class ParkingCommonParam {
     * 请求签名
     */
    private String sign;
+
+    public Map<String, String> getPublicParams() {
+        Map<String, String> publicParams = new HashMap<>();
+        publicParams.put("service", service);
+        publicParams.put("version", version);
+        publicParams.put("msgId", msgId);
+        publicParams.put("orgId", orgId);
+        return publicParams;
+    }
 }
--- a/jsowell-common/src/main/java/com/jsowell/common/util/ParkingUtil.java
+++ b/jsowell-common/src/main/java/com/jsowell/common/util/ParkingUtil.java
@@ -1,5 +1,6 @@
 package com.jsowell.common.util;

+import com.jsowell.common.core.domain.parking.ParkingCommonParam;
 import com.jsowell.common.util.sign.MD5Util;

 import java.util.HashMap;
@@ -35,6 +36,14 @@ public class ParkingUtil {
        return MD5Util.MD5Encode(stringC).toLowerCase();
    }

+    /**
+     * 设置sign
+     */
+    public static void generateAndSetSign(ParkingCommonParam param, String secretKey) {
+        String sign = generateSign(param.getPublicParams(), param.getData(), secretKey);
+        param.setSign(sign);
+    }
+
    public static void main(String[] args) {
        // 模拟公共请求参数
        Map<String, String> publicParams = new HashMap<>();
--- a/jsowell-ui/package.json
+++ b/jsowell-ui/package.json
@@ -57,7 +57,8 @@
    "vue-qr": "^4.0.9",
    "vue-router": "3.4.9",
    "vuedraggable": "2.24.3",
-    "vuex": "3.6.0"
+    "vuex": "3.6.0",
+    "xlsx": "^0.18.5"
  },
  "devDependencies": {
    "@vue/cli-plugin-babel": "4.4.6",
--- a/jsowell-ui/src/api/pile/station.js
+++ b/jsowell-ui/src/api/pile/station.js
@@ -121,14 +121,6 @@ export function getRelationByStationId(id) {
  });
 }

-// 查询站点互联互通配置
-export function getSettingInfo(data) {
-  return request({
-    url: "/pile/station/getSettingInfo",
-    method: "post",
-    data: data,
-  });
-}

 // 修改站点互联互通配置
 export function updateSettingByStationId(data) {
--- a/jsowell-ui/src/views/homeIndex/echarts.js
+++ b/jsowell-ui/src/views/homeIndex/echarts.js
@@ -1,35 +1,70 @@
+import * as XLSX from 'xlsx';
+import { saveAs } from 'file-saver';
+
 export function barDataView(titleName, fileName) {
  var dataView = {
    show: true,
    readOnly: false,
-    lang: ['数据视图', '关闭', '刷新'],
-    optionToContent: function(opt) {
-      var axisData = opt.xAxis[0].data // 坐标数据
-      var series = opt.series // 折线图数据
-      var tdHeads = ''
+    lang: ['数据视图', '关闭', '导出Excel'],
+    optionToContent: function (opt) {
+      var axisData = opt.xAxis[0].data; // 坐标数据
+      var series = opt.series; // 折线图数据
+      var tdHeads = '';
      for (let index = 0; index < titleName.length; index++) {
-        // 样式
-        tdHeads += '<td  style="height:30px;text-align: center;">' + titleName[index] + '</td>'
+        tdHeads += '<td style="height:30px;text-align: center;">' + titleName[index] + '</td>';
      }
-      var tdBodys = '' // 表数据
-      var table = '<table id="tableExcel_Day" border="1" class="table-bordered table-striped" style="width:100%;text-align:centerborder:1px solid #ccc;border-collapse:collapse;" ><tbody><tr>' + tdHeads + ' </tr>'
-      // 组装表数据
+      var tdBodys = ''; // 表数据
+      var tableId = 'tableExcel_' + new Date().getTime(); // 动态表格ID
+      var table = `<table id="${tableId}" border="1" class="table-bordered table-striped" style="width:100%;text-align:center;border:1px solid #ccc;border-collapse:collapse;"><tbody><tr>${tdHeads}</tr>`;
+
      for (var i = 0, l = axisData.length; i < l; i++) {
+        tdBodys = '<td style="height:30px;text-align: center;">' + axisData[i] + '</td>'; // 添加坐标轴数据
        for (var j = 0; j < series.length; j++) {
-          var temp = series[j].data[i]
+          var temp = series[j].data[i];
          if (temp != null && temp !== undefined) {
-            tdBodys += '<td>' + temp + '</td>'
+            tdBodys += '<td>' + temp + '</td>';
          } else {
-            tdBodys += '<td></td>'
+            tdBodys += '<td></td>';
          }
        }
-        // 样式
-        table += '<tr style="height:30px;text-align: center;"><td >' + axisData[i] + '</td>' + tdBodys + '</tr>'
-        tdBodys = ''
+        table += '<tr>' + tdBodys + '</tr>';
      }
-      table += '</tbody></table>'
-      return table
+      table += '</tbody></table>';
+      return table;
+    },
+    contentToOption: function (html, opt) {
+      console.log('HTMLDomElement:', html); // 调试信息
+      if (!html || !html.tagName) {
+        console.error('Invalid HTML element passed to contentToOption');
+        return opt;
      }
+
+      // 获取表格元素
+      let tableElement = html.querySelector('table');
+
+      if (!tableElement) {
+        console.error('Table element not found within the provided HTML element');
+        return opt;
      }
-  return dataView
+
+      let et = XLSX.utils.table_to_book(tableElement);
+      let etout = XLSX.write(et, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array",
+      });
+
+      try {
+        saveAs(
+          new Blob([etout], { type: "application/octet-stream" }),
+          `${fileName}-${new Date().toLocaleString().replace(/[:\/]/g, '-')}.xlsx`
+        );
+      } catch (e) {
+        console.error("Export failed:", e);
+      }
+
+      return opt; // 返回原始选项，因为这里没有修改图表的配置
+    },
+  };
+  return dataView;
 }
--- a/jsowell-ui/src/views/homeIndex/homeIndex.vue
+++ b/jsowell-ui/src/views/homeIndex/homeIndex.vue
@@ -2,30 +2,36 @@
  <div class="app-container">
    <h1>概况 (自2023-01-01起)</h1>
    <hr />
-        <div style="display: flex;justify-content: space-between;margin-top: 10px;flex-wrap: wrap;">
-            <div class="box" style="background-color: #ffba00;">
+    <div
+      style="
+        display: flex;
+        justify-content: space-between;
+        margin-top: 10px;
+        flex-wrap: wrap;
+      "
+    >
+      <div class="box" style="background-color: #ffba00">
        <el-image class="box-image" :src="require('@/assets/images/lightning.png')" />
        <div class="flex1">
          <div class="box-h1">{{ generalSituation.totalChargingDegree }}</div>
          <div>总充电电量(度)</div>
        </div>
-
      </div>
-            <div class="box" style="background-color: #c74542;">
+      <div class="box" style="background-color: #c74542">
        <el-image class="box-image" :src="require('@/assets/images/zongfeiyong.png')" />
        <div class="flex1">
          <div class="box-h1">{{ generalSituation.totalChargingAmount }}</div>
          <div>总充电费用(元)</div>
        </div>
      </div>
-            <div class="box" style="background-color: #12ce65;">
+      <div class="box" style="background-color: #12ce65">
        <el-image class="box-image" :src="require('@/assets/images/dingdan.png')" />
        <div class="flex1">
          <div class="box-h1">{{ generalSituation.totalChargingQuantity }}</div>
          <div>总充电订单数(笔)</div>
        </div>
      </div>
-            <div class="box" style="background-color: #909399;">
+      <div class="box" style="background-color: #909399">
        <el-image class="box-image" :src="require('@/assets/images/shebei.png')" />
        <div class="flex1">
          <div class="box-h1">{{ generalSituation.totalPileQuantity }}</div>
@@ -42,12 +48,10 @@
      <!--                            <div>总客户余额(元)</div>-->
      <!--                        </div>-->
      <!--                    </div>-->
-
    </div>
    <h1>订单</h1>
    <hr />
-        <el-button style="background-color: #1ab394; color: #ffffff">最近30天
-        </el-button>
+    <el-button style="background-color: #1ab394; color: #ffffff">最近30天 </el-button>
    <div ref="chart" :style="{ width: '100%', height: '500px' }"></div>
    <hr />
    <!-- <h1>启动充电渠道</h1> -->
@@ -68,18 +72,19 @@ export default {
      chart: null,
      generalSituation: {},
      orderInfo: [],
-            tableData: [{
-                pileSn: '9527',
-                stationName: '万车充充电桩',
-                stationAddress: '昆山市黄埔江南路',
-                type: '直流',
-                power: '2131',
-                degree: '215',
-                electricityPrice: '565',
-                servicePrice: '9274',
-                chargingNumber: '624',
-
-            }]
+      tableData: [
+        {
+          pileSn: "9527",
+          stationName: "万车充充电桩",
+          stationAddress: "昆山市黄埔江南路",
+          type: "直流",
+          power: "2131",
+          degree: "215",
+          electricityPrice: "565",
+          servicePrice: "9274",
+          chargingNumber: "624",
+        },
+      ],
    };
  }, //图表实例
  created() {
@@ -98,7 +103,7 @@ export default {
    async getOrder() {
      const { obj, resCode } = await getOrderInfo({});
      console.log("订单信息", obj, resCode);
-            if (resCode === '00100000') {
+      if (resCode === "00100000") {
        this.orderInfo = obj;
      }
    },
@@ -285,7 +290,18 @@ export default {
            },
          ],
        };
-                option.toolbox.feature.dataView = barDataView(['时间/日期', '总用电量', '总订单金额', '尖时段总用电量', '峰时段总用电量', '平时段总用电量', '谷时段总用电量'], '电量电费')
+        option.toolbox.feature.dataView = barDataView(
+          [
+            "时间/日期",
+            "总用电量",
+            "总订单金额",
+            "尖时段总用电量",
+            "峰时段总用电量",
+            "平时段总用电量",
+            "谷时段总用电量",
+          ],
+          "电量电费"
+        );
        this.chart.setOption(option);
      });
    },
--- a/jsowell-ui/src/views/pile/station/detail.vue
+++ b/jsowell-ui/src/views/pile/station/detail.vue
@@ -255,10 +255,8 @@ import stationWhiteList from "@/views/pile/station/stationWhiteList";
 import {
  getStationInfo,
  updateStationQRCodePrefix,
-  getSettingByStationId,
  updateSettingByStationId,
  pushStationInfo,
-  getSettingInfo,
  getParkingInfoList,
  bindParkingPlatform,
  getRelationByStationId,