接口更新

car-wash-entity/src/main/java/com/kym/entity/miniapp/queryParams/DeviceQueryParams.java

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class DeviceQueryParams extends PageParams {
 
+    private Long id;
     private String shortId;
     private String stationId;
     private String productKey;

car-wash-miniapp/src/main/java/com/kym/miniapp/controller/UserController.java

@@ -3,7 +3,6 @@ package com.kym.miniapp.controller;
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.kym.common.R;
-import com.kym.common.utils.IDGenerator;
 import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.User;
 import com.kym.entity.miniapp.queryParams.WxLoginParams;
@@ -29,12 +28,10 @@ public class UserController {
 
     private final CollectService collectService;
 
-    private final IDGenerator idGenerator;
 
-    public UserController(UserService userService, CollectService collectService, IDGenerator idGenerator) {
+    public UserController(UserService userService, CollectService collectService) {
         this.userService = userService;
         this.collectService = collectService;
-        this.idGenerator = idGenerator;
     }
 
     /**
@@ -59,18 +56,6 @@ public class UserController {
         return R.success();
     }
 
-    /**
-     * 刷新token
-     *
-     * @return
-     */
-    @GetMapping("/refresh")
-    public R<?> refreshToken() {
-        // 365天有效期，微信手机号接口开始收费了，有效期给长一点。
-        StpUtil.renewTimeout(3600 * 24 * 365L);
-        return R.success();
-    }
-
     /**
      * 当前用户信息
      *
@@ -81,17 +66,6 @@ public class UserController {
         return R.success(userService.getMe());
     }
 
-    /**
-     * 获取单个用户信息
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping("/{id}")
-    User getUser(@PathVariable("id") Long id) {
-        return userService.getById(id);
-    }
-
     /**
      * 用户列表
      *
@@ -104,18 +78,6 @@ public class UserController {
         return userService.listUserVo(pageNum, pageSize);
     }
 
-    /**
-     * 新增用户
-     *
-     * @param user
-     * @return
-     */
-    @PostMapping
-    Boolean saveUser(@RequestBody User user) {
-        user.setId(idGenerator.nextId());
-        return userService.save(user);
-    }
-
     /**
      * 更新用户信息
      *

car-wash-service/src/main/java/com/kym/service/miniapp/impl/UserServiceImpl.java

@@ -154,19 +154,6 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
             userVo.setDefaultPlateNo(car.getPlateNo());
             userVo.setVin(car.getVin());
         }
-
-        var bannerList = bannerService.list();
-        var rechargeRight = rechargeRightsService.lambdaQuery().eq(RechargeRights::getStatus, Activity.STATUS_进行中).list();
-        var activityList = activityService.lambdaQuery().eq(Activity::getStatus, Activity.STATUS_进行中).list();
-        var voList = activityList.stream().map(activity -> {
-            var vo = new ActivityVo();
-            BeanUtils.copyProperties(activity, vo);
-            vo.setRechargeRightsList(rechargeRight.stream().filter(rights -> rights.getActivityId().equals(activity.getId())).toList());
-            vo.setBannerList(bannerList.stream().filter(banner -> banner.getActivityId().equals(activity.getId())).toList());
-            return vo;
-        }).toList();
-        userVo.setActivityList(voList);
-
         return userVo;
     }
 

car-wash-service/src/main/java/com/kym/service/miniapp/impl/WashDeviceServiceImpl.java

@@ -38,7 +38,11 @@ public class WashDeviceServiceImpl extends MyBaseServiceImpl<WashDeviceMapper, W
      */
     @Override
     public List<WashDevice> listWashDevice(DeviceQueryParams params) {
-        return lambdaQuery().eq(CommUtil.isNotEmptyAndNull(params.getStationId()), WashDevice::getStationId, params.getStationId()).orderByAsc(WashDevice::getDeviceName).list();
+        return lambdaQuery()
+                .eq(CommUtil.isNotEmptyAndNull(params.getId()), WashDevice::getId, params.getId())
+                .eq(CommUtil.isNotEmptyAndNull(params.getStationId()), WashDevice::getStationId, params.getStationId())
+                .orderByAsc(WashDevice::getDeviceName)
+                .list();
     }
 
     /**