部分代码迁移至admin模块

admin/src/main/java/com/kym/admin/config/SaTokenConfigure.java

@@ -20,7 +20,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
         registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin()))
                 .addPathPatterns("/**")
                 // login接口不鉴权
-                .excludePathPatterns("/charge/admin-user/login");
+                .excludePathPatterns("/admin-user/login", "/station/pullEnStations");
     }
     // TODO: 2023-07-11 具体功能权限校验后续开发
 

admin/src/main/java/com/kym/admin/controller/AdminUserController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-07-11
  */
 @RestController
-@RequestMapping("/charge/admin-user")
+@RequestMapping("/admin-user")
 public class AdminUserController {
 
     @Autowired

admin/src/main/java/com/kym/admin/controller/AdminUserRoleController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-07-12
  */
 @RestController
-@RequestMapping("/charge/admin-user-role")
+@RequestMapping("/admin-user-role")
 public class AdminUserRoleController {
 
 }

admin/src/main/java/com/kym/admin/controller/StationController.java

@@ -1,6 +1,13 @@
 package com.kym.admin.controller;
 
+import com.kym.common.R;
+import com.kym.common.annotation.SysLog;
+import com.kym.service.admin.StationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -15,4 +22,28 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/station")
 public class StationController {
 
+    @Autowired
+    private StationService stationService;
+
+    @SysLog("充电站数据统计")
+    @GetMapping("/stationStatusDetail")
+    R stationStatusDetail(@RequestParam("stationId") String stationId,
+                          @RequestParam("startTime") @DateTimeFormat(pattern = "yyyy-MM-dd") String startTime,
+                          @RequestParam("endTime") @DateTimeFormat(pattern = "yyyy-MM-dd") String endTime) {
+        // 请求en+接口
+        var response = stationService.stationStats(stationId, startTime, endTime);
+        return R.success(response);
+    }
+
+    /**
+     * 拉取EN+充电站信息数据并更新本地服务器数据
+     *
+     * @return
+     */
+    @GetMapping("/pullEnStations")
+    R pullEnStationInfos() {
+        stationService.pullEnStationInfos();
+        return R.success();
+    }
+
 }

admin/src/main/resources/application.yml

@@ -48,6 +48,8 @@ spring:
 #    map-underscore-to-camel-case: true #下划线转驼峰
 server:
   port: 9000
+  servlet:
+    context-path: /admin
 # PageHelper
 pagehelper:
   propertyName: propertyValue

miniapp/src/main/java/com/kym/miniapp/controller/ChargerController.java

@@ -57,18 +57,6 @@ public class ChargerController {
         return R.success(response);
     }
 
-    // TODO: 2023-08-16 挪到admin
-    @SysLog("充电站数据统计")
-    @GetMapping("/stationStatusDetail")
-    R stationStatusDetail(@RequestParam("stationId") String stationId,
-                          @RequestParam("startTime") @DateTimeFormat(pattern = "yyyy-MM-dd") String startTime,
-                          @RequestParam("endTime") @DateTimeFormat(pattern = "yyyy-MM-dd") String endTime) {
-        // 请求en+接口
-        var response = stationService.stationStats(stationId, startTime, endTime);
-        return R.success(response);
-    }
-
-
     @GetMapping("/token")
     R<String> queryToken() {
         return R.success(enPlusService.queryToken());
@@ -172,7 +160,6 @@ public class ChargerController {
 
 
     //====================================================以下是手动同步数据接口==============================================================
-    // TODO: 2023-08-14 挪到admin
 
     /**
      * 拉取EN+充电站信息数据并更新本地服务器数据