微信小程序接口联调

takai-admin/src/main/java/org/dromara/web/controller/AuthController.java

@@ -40,7 +40,9 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.net.URL;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 认证
@@ -206,5 +208,16 @@ public class AuthController {
         return R.ok("退出成功");
     }
 
+    /**
+     * token校验
+     * @param Authorization
+     * @return
+     */
+    @GetMapping("/checkToken")
+    public R<Boolean> checkToken(@RequestHeader String Authorization){
+        boolean status = loginService.checkToken(Authorization);
+        return R.ok(status);
+    }
+
 
 }

takai-admin/src/main/java/org/dromara/web/service/SysLoginService.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhyd.oauth.model.AuthUser;
+import org.apache.commons.lang3.StringUtils;
 import org.dromara.common.core.constant.Constants;
 import org.dromara.common.core.constant.GlobalConstants;
 import org.dromara.common.core.constant.TenantConstants;
@@ -228,4 +229,12 @@ public class SysLoginService {
         RedisUtils.deleteObject("LOGIN_USER_APP_KEY");
     }
 
+    public boolean checkToken(String token){
+        String loginToken = RedisUtils.getCacheObject("LOGIN_USER_APP_KEY");
+        if(StringUtils.isNotBlank(loginToken) && loginToken.equals(token)){
+            return true;
+        }
+        return false;
+    }
+
 }

takai-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java

@@ -34,6 +34,8 @@ import org.dromara.web.service.IAuthStrategy;
 import org.dromara.web.service.SysLoginService;
 import org.springframework.stereotype.Service;
 
+import java.util.UUID;
+
 /**
  * 密码认证策略
  *
@@ -105,22 +107,27 @@ public class PasswordAuthStrategy implements IAuthStrategy {
 
         loginService.checkLogin(LoginType.PASSWORD, null, username, () -> !BCrypt.checkpw(password, user.getPassword()));
         // 此处可根据登录用户的数据不同 自行创建 loginUser
-        LoginUser loginUser = loginService.buildLoginUser(user);
-        SysClient client = clientService.queryByClientId(clientId);
-        SaLoginModel model = new SaLoginModel();
-        model.setDevice(client.getDeviceType());
-        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
-        // 例如: 后台用户30分钟过期 app用户1天过期
-        model.setTimeout(client.getTimeout());
-        model.setActiveTimeout(client.getActiveTimeout());
-        model.setExtra(LoginHelper.CLIENT_KEY, clientId);
-        // 生成token
-        LoginHelper.login(loginUser, model);
+//        LoginUser loginUser = loginService.buildLoginUser(user);
+//        SysClient client = clientService.queryByClientId(clientId);
+//        SaLoginModel model = new SaLoginModel();
+//        model.setDevice(client.getDeviceType());
+//        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+//        // 例如: 后台用户30分钟过期 app用户1天过期
+//        model.setTimeout(client.getTimeout());
+//        model.setActiveTimeout(client.getActiveTimeout());
+//        model.setExtra(LoginHelper.CLIENT_KEY, clientId);
+//        // 生成token
+//        LoginHelper.login(loginUser, null);
 
         //RedisUtils.deleteObject(errorKey);
-        StpUtil.getSession().set(LOGIN_USER_KEY, loginUser);
-        RedisUtils.setCacheObject("LOGIN_USER_APP_KEY", StpUtil.getTokenValue());
-        return RedisUtils.getCacheObject("LOGIN_USER_APP_KEY");
+        //StpUtil.getSession().set(LOGIN_USER_KEY, loginUser);
+//        String token = StpUtil.getTokenValue();
+        String token = "";
+        for (int i=0; i<2; i++) {
+            token += UUID.randomUUID().toString();
+        }
+        RedisUtils.setCacheObject("LOGIN_USER_APP_KEY", token);
+        return token;
     }
 
     /**

takai-modules/takai-system/src/main/java/org/dromara/system/controller/room/SysImgController.java

@@ -104,7 +104,7 @@ public class SysImgController extends BaseController {
     }
 
     @SaCheckPermission("system:img:wximg")
-    @GetMapping("/wximg")
+        @GetMapping("/wximg")
     public TableDataInfo<SysImgVo> wximg() {
         return sysImgService.selectImg();
     }

takai-modules/takai-system/src/main/java/org/dromara/system/service/impl/RoomServiceImpl.java

@@ -122,6 +122,7 @@ public class RoomServiceImpl implements IRoomService {
         lqw.eq(StringUtils.isNotBlank(bo.getRoomSize()), Room::getRoomSize, bo.getRoomSize());
         lqw.eq(StringUtils.isNotBlank(bo.getDirection()), Room::getDirection, bo.getDirection());
         lqw.eq(bo.getFloorNum() != null, Room::getFloorNum, bo.getFloorNum());
+        lqw.orderByDesc(Room::getCreateTime);
         return lqw;
     }
 
@@ -309,16 +310,18 @@ public class RoomServiceImpl implements IRoomService {
                     RegionFacilitiesBo rfBo = new RegionFacilitiesBo();
                     rfBo.setRegionId(r.getRegionId());
                     List<RegionFacilitiesVo> regFacList = regionFacilitiesService.queryList(rfBo);
+                    if(!regFacList.isEmpty() && regFacList.size() > 0){
+                        List<String> facilitiesIds = regFacList.stream().map(RegionFacilitiesVo::getFacilitiesId).collect(Collectors.toList());
 
-                    List<String> facilitiesIds = regFacList.stream().map(RegionFacilitiesVo::getFacilitiesId).collect(Collectors.toList());
-                    List<FacilitiesVo> facilitiesList = facilitiesMapper.selectByFacilitiesId(facilitiesIds);
-                    System.out.println(facilitiesList.toString()+"-----------设施数据----------");
+                        List<FacilitiesVo> facilitiesList = facilitiesMapper.selectByFacilitiesId(facilitiesIds);
+                        System.out.println(facilitiesList.toString()+"-----------设施数据----------");
 
-                    for(FacilitiesVo fv: facilitiesList){
-                        List<SysImgVo> sysimgF = this.querySysImg(fv.getFacilitiesId()); //设施图片
-                        fv.setSysimg(sysimgF);
+                        for(FacilitiesVo fv: facilitiesList){
+                            List<SysImgVo> sysimgF = this.querySysImg(fv.getFacilitiesId()); //设施图片
+                            fv.setSysimg(sysimgF);
+                        }
+                        r.setRegionFacilities(facilitiesList);
                     }
-                    r.setRegionFacilities(facilitiesList);
                 }
             }
             roomVo.setRegion(regionList);