充电桩列表修改

admin-web/src/router/route.ts

@@ -134,14 +134,14 @@ export const adminRoutes: Array<RouteRecordRaw> = [
                             icon: 'ele-OfficeBuilding',
                         },
                     },
-                  {
+                    {
                         path: '/station/endpoint/:id',
                         name: 'adminStationEndpoint',
                         component: () => import('/@/views/admin/station/endpoint/index.vue'),
                         meta: {
                             title: '电桩监控',
                             isLink: '',
-                            isHide: true,
+                            isHide: false,
                             isKeepAlive: true,
                             isAffix: false,
                             isIframe: false,

admin-web/src/stores/themeConfig.ts

@@ -139,9 +139,9 @@ export const useThemeConfig = defineStore('themeConfig', {
              * 全局网站标题 / 副标题
              */
             // 网站主标题（菜单导航、浏览器当前网页标题）
-            globalTitle: '快与慢充电运营',
+            globalTitle: 'K7运营平台',
             // 网站副标题（登录页顶部文字）
-            globalViceTitle: '运营管理平台',
+            globalViceTitle: 'K7运营平台',
             // 网站副标题（登录页顶部文字）
             globalViceTitleMsg: '为 美 好 生 活 加 电 ！',
             // 默认初始语言，可选值"<zh-cn|en|zh-tw>"，默认 zh-cn

admin-web/src/views/admin/station/endpoint/index.vue

@@ -144,14 +144,17 @@ const state = reactive({
     loading: false,
     columns: [
       {label: '站点ID', prop: 'stationId', resizable: true,width: 100,fixed:'left'},
+      {label: '站点编号', prop: 'stationNo', resizable: true,width: 100,fixed:'left'},
+      {label: '站点编号', prop: 'stationName', resizable: true,width: 200,fixed:'left'},
+      {label: '充电桩编号', prop: 'shortId', resizable: true,width: 110,fixed:'left'},
       {label: '充电桩序列号', prop: 'equipmentId', width: 180, resizable: true},
       {label: '设备型号', prop: 'equipmentModel', width: 150, resizable: true},
       {label: '服务状态', prop: 'serviceStatus', resizable: true, width: 130},
       {label: '设备类型', prop: 'equipmentType', resizable: true, width: 130},
       // {label: '位置坐标', prop: 'location', resizable: true, width: 150},
       {label: '网络状态', prop: 'netStatus', resizable: true, width: 130},
-      {label: '设备生产商组织机构代码', prop: 'manufacturerId', width: 200, resizable: true},
-      {label: '设备生产商名称', prop: 'manufacturerName', width: 160, resizable: true},
+      // {label: '设备生产商组织机构代码', prop: 'manufacturerId', width: 200, resizable: true},
+      // {label: '设备生产商名称', prop: 'manufacturerName', width: 160, resizable: true},
       {label: '设备生产日期', prop: 'productionDate', width: 160, resizable: true},
       {label: '更新时间', prop: 'updateTime', sortable: 'custom', resizable: true, width: 180},
       /*{

admin-web/src/views/login/index.vue

@@ -77,7 +77,7 @@ onMounted(() => {
 	height: 100%;
   text-align: right;
 	//background: var(--el-color-white);
-  background-image: url("/@/assets/shenzhen.webp");
+  background-image: url("/@/assets/login-bg.png");
 	.login-left {
     position: relative;
 		background-color: rgba(211, 239, 255, 1);
@@ -102,7 +102,7 @@ onMounted(() => {
 				span {
 					margin-left: 10px;
 					font-size: 28px;
-					color: #26a59a;
+					color: #83b6cf;
 				}
 				.login-left-logo-text-msg {
 					font-size: 12px;

entity/src/main/java/com/kym/entity/admin/EquipmentInfo.java

@@ -41,6 +41,12 @@ public class EquipmentInfo extends BaseEntity {
     @TableField(exist = false)
     private String stationNo;
 
+    /**
+     * 站点名称
+     */
+    @TableField(exist = false)
+    private String stationName;
+
     /**
      * 充电桩序列号
      */
@@ -167,4 +173,9 @@ public class EquipmentInfo extends BaseEntity {
     public void setServiceStatus(Integer serviceStatus) {
         this.serviceStatus = serviceStatus;
     }
+
+    public EquipmentInfo setStationName(String stationName) {
+        this.stationName = stationName;
+        return this;
+    }
 }

service/src/main/java/com/kym/service/admin/impl/EquipmentInfoServiceImpl.java

@@ -45,10 +45,14 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
                 .eq(isNotNull(params.getStationId()), EquipmentInfo::getStationId, params.getStationId())
                 .eq(isNotNull(params.getStatus()), EquipmentInfo::getNetStatus, params.getStatus())
                 .list();
+        var page = new PageBean<>(equipmentInfos);
         // TODO: 2023-09-02  parallelStream 这里可能有坑，注意检查
-        var res = equipmentInfos.parallelStream().map(item -> item.setShortId(kymCache.getShortId(item.getEquipmentId())))
+        var res = equipmentInfos.parallelStream().map(item ->
+                        item.setShortId(kymCache.getShortId(item.getEquipmentId())).setStationName(kymCache.getStationName(item.getStationId()))
+                )
                 .toList().stream().sorted(Comparator.comparing(EquipmentInfo::getShortId)).toList();
-        return new PageBean<>(res);
+        page.setList(res);
+        return page;
     }
 
     @Override