更换注解

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

@@ -2,6 +2,7 @@ package com.kym.admin.controller;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.kym.common.R;
+import com.kym.common.annotation.SysLog;
 import com.kym.service.admin.AdminUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,9 +25,10 @@ public class AdminUserController {
     @Autowired
     private AdminUserService adminUserService;
 
+    @SysLog("登录")
     @PostMapping("login")
     R adminLogin(@RequestBody JSONObject json) {
-        return adminUserService.login(json.getString("username"), json.getString("password"));
+        return adminUserService.login(json.getString("mobilePhone"), json.getString("password"));
     }
 
 }

miniapp/src/main/java/com/kym/miniapp/aspect/SysLogAspect.java

@@ -1,13 +1,13 @@
-package com.kym.admin.aspect;
+package com.kym.miniapp.aspect;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.google.gson.Gson;
 import com.kym.common.annotation.SysLog;
 import com.kym.common.utils.HttpContextUtils;
 import com.kym.common.utils.IDGenerator;
 import com.kym.common.utils.IPUtils;
-import com.kym.service.admin.SystemLogService;
 import com.kym.entity.admin.SystemLog;
-import com.google.gson.Gson;
+import com.kym.service.admin.SystemLogService;
 import jakarta.servlet.http.HttpServletRequest;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -32,12 +32,10 @@ import java.lang.reflect.Method;
 public class SysLogAspect {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SysLogAspect.class);
-
+    IDGenerator idGenerator;
     @Autowired
     private SystemLogService systemLogService;
 
-    IDGenerator idGenerator;
-
     SysLogAspect() {
         this.idGenerator = new IDGenerator();
     }
@@ -86,7 +84,7 @@ public class SysLogAspect {
         //用户名、公司id、后台用户id
         systemLog.setUserId(StpUtil.getSession().getLong("userId"));
         systemLog.setCompanyId(StpUtil.getSession().getLong("companyId"));
-        systemLog.setUsername(StpUtil.getSession().getString("username"));
+        systemLog.setUsername(StpUtil.getSession().getString("mobilePhone"));
         systemLog.setExecuteTime(executeTime);
 
         //保存系统日志

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

@@ -40,7 +40,7 @@ public class ChargerController {
     private EnNotifyService enNotifyService;
 
     @SneakyThrows
-    @SysLog("充电站列表")
+    @ApiLog("充电站列表")
     @GetMapping("/listStation")
     R listChargeStation(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         // 请求en+接口
@@ -48,7 +48,7 @@ public class ChargerController {
         return R.success(response);
     }
 
-    @SysLog("充电站状态")
+    @ApiLog("充电站状态")
     @GetMapping("/stationStatus")
     R stationStatus(@RequestParam("stationIds") String ids) {
         // 请求en+接口
@@ -61,26 +61,26 @@ public class ChargerController {
         return R.success(enPlusService.queryToken());
     }
 
-    @SysLog("启动充电")
+    @ApiLog("启动充电")
     @GetMapping("/startCharge")
     R startCharge(@RequestParam("connectorId") String connectorId, @RequestParam("stationId") String stationId) {
         return R.success(chargeService.queryStartCharge(connectorId, stationId));
     }
 
-    @SysLog("停止充电")
+    @ApiLog("停止充电")
     @GetMapping("/stopCharge/{connectorId}")
     R stopCharge(@PathVariable("connectorId") String connectorId) {
         chargeService.queryStopCharge(connectorId);
         return R.success();
     }
 
-    @SysLog("查询充电状态")
+    @ApiLog("查询充电状态")
     @GetMapping("/chargeStatus/{startChargeSeq}")
     R<ChargeOrder> chargeStatus(@PathVariable("startChargeSeq") String startChargeSeq) {
         return R.success(chargeService.queryEquipChargeStatus(startChargeSeq));
     }
 
-    @SysLog("查询设备充电策略")
+    @ApiLog("查询设备充电策略")
     @GetMapping("/businessPolicy/{connectorId}")
     R businessPolicy(@PathVariable("connectorId") String connectorId) {
         return R.success(chargeService.queryEquipBusinessPolicy(connectorId));
@@ -98,7 +98,7 @@ public class ChargerController {
      * @param json
      * @return 0:接收 1：丢弃/忽略，不需要重试
      */
-    @SysLog("EN+设备状态变化推送")
+    @ApiLog("EN+设备状态变化推送")
     @PostMapping("/notification_stationStatus")
     JSONObject notificationStationStatus(@RequestBody JSONObject json) {
         // TODO: 2023-08-05 验签 业务逻辑
@@ -114,7 +114,7 @@ public class ChargerController {
      * @param json
      * @return StartChargeSeq SuccStat 0:成功 1：失败  FailReason 0:无 1：接收失败
      */
-    @SysLog("EN+推送启动充电结果")
+    @ApiLog("EN+推送启动充电结果")
     @PostMapping("/notification_start_charge_result")
     @ResponseBody
     EnResponse notificationStartChargeResult(@RequestBody JSONObject json) {
@@ -128,7 +128,7 @@ public class ChargerController {
      * @param json
      * @return
      */
-    @SysLog("EN+推送启动充电结果")
+    @ApiLog("EN+推送启动充电结果")
     @PostMapping("/notification_start_charge_status")
     EnResponse notificationStartChargeStatus(@RequestBody JSONObject json) {
         return new EnResponse(enNotifyService.handleNotificationEquipChargeStatus(json));

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

@@ -20,7 +20,7 @@ public class CommonController {
     @Autowired
     private ContactService contactService;
 
-    @SysLog("联系我们")
+    @ApiLog("联系我们")
     @GetMapping("/contact")
     R contact() {
         return R.success(contactService.list().stream().findFirst());

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

@@ -33,7 +33,7 @@ public class DataDictController extends IController {
     @Resource
     private DataDictService dataDictService;
 
-    @SysLog("字典列表")
+    @ApiLog("字典列表")
     @PostMapping("list")
     public R<?> list(@RequestBody IQuery<DataDict> query) {
         return resp(() -> dataDictService.list(query));

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

@@ -27,7 +27,7 @@ public class FileController {
     @Resource
     private AttachmentService attachmentService;
 
-    @SysLog("文件上传")
+    @ApiLog("文件上传")
     @PostMapping("/upload")
     public R<?> upload(MultipartFile file) throws IOException {
         var fileName = file.getOriginalFilename();

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

@@ -42,13 +42,13 @@ public class UserController {
      * @param params
      * @return
      */
-    @SysLog("微信登录")
+    @ApiLog("微信登录")
     @PostMapping("/wxLogin")
     public R login(@RequestBody @Validated WxLoginParams params) {
         return userService.wxlogin(params);
     }
 
-    @SysLog("登出")
+    @ApiLog("登出")
     @PostMapping("/logout/{userId}")
     public R logout(@PathVariable Long userId) {
         // TODO: 2023-07-26 参数校验
@@ -56,7 +56,7 @@ public class UserController {
         return R.success();
     }
 
-    @SysLog("刷新TOKEN")
+    @ApiLog("刷新TOKEN")
     @GetMapping("/refresh")
     public R refreshToken() {
         // 7天有效期
@@ -64,45 +64,45 @@ public class UserController {
         return R.success();
     }
 
-    @SysLog("获取当前用户")
+    @ApiLog("获取当前用户")
     @GetMapping("/me")
     public R me() {
         return R.success(userService.getMe());
     }
 
-    @SysLog("查询单个用户")
+    @ApiLog("查询单个用户")
     @GetMapping("/{id}")
     User getUser(@PathVariable("id") Long id) {
         return userService.getById(id);
     }
 
-    @SysLog("用户列表")
+    @ApiLog("用户列表")
     @GetMapping("listUser")
     PageInfo<UserVo> listUser(@RequestParam int pageNum, @RequestParam int pageSize) {
         return userService.listUserVo(pageNum, pageSize);
     }
 
-    @SysLog("新增用户")
+    @ApiLog("新增用户")
     @PostMapping
     Boolean saveUser(@RequestBody User user) {
         user.setId(idGenerator.nextId());
         return userService.save(user);
     }
 
-    @SysLog("更新用户")
+    @ApiLog("更新用户")
     @PutMapping
     R updateUser(@RequestBody UserVo userVo) {
         userService.updateUser(userVo);
         return R.success();
     }
 
-    @SysLog("收藏列表")
+    @ApiLog("收藏列表")
     @GetMapping("/collectList")
     R listCollect() {
         return R.success(collectService.listCollect());
     }
 
-    @SysLog("添加/取消收藏")
+    @ApiLog("添加/取消收藏")
     @PostMapping("/collect")
     R saveCollect(@RequestBody JSONObject json) {
         collectService.updateCollect(json.getString("stationId"), json.getInteger("status"));