From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡
---
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionUserApi.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionUserApi.java b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionUserApi.java
index 7540965..dc9c3d9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionUserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionUserApi.java
@@ -1,42 +1,39 @@
package com.chuangongzhijia.huacheng_union_applets.api;
-import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.equipment.UnionUserDto;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActDpcVO;
import com.panzhihua.common.service.community.CommunityUnionService;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.ApiImplicitParam;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
@Slf4j
@Api(tags = {"用户相关"})
@RestController
@RequestMapping("/unionUser")
-public class UnionUserApi extends BaseController {
+public class UnionUserApi {
@Resource
private CommunityUnionService communityUnionService;
- @Resource
- private UserService userService;
+// @Resource
+// private UserService userService;
/**
* 总工会户外劳登录
*
+ *
* @return 总工会户外劳共用户
*/
- @ApiOperation(value = "总工会户外劳登录")
- @PostMapping("/login")
- public R login(){
- LoginUserInfoVO userInfoByUserId = userService.getUserInfoByUserId("1588095866109984769").getData();
- return communityUnionService.unionUserLogin(userInfoByUserId);
+ @ApiOperation(value = "总工会户外劳登录(H5)")
+ @GetMapping("/login")
+ public R login(@RequestParam(value = "phone") String phone){
+ return communityUnionService.unionUserLoginH5(phone);
}
/**
@@ -45,10 +42,24 @@
* @param unionUserDto
* @return 总工会户外劳共用户
*/
+
@ApiOperation(value = "总工会户外劳工站用户认证")
@PostMapping("/authentication")
public R authentication(@RequestBody UnionUserDto unionUserDto){
+ unionUserDto.setIsApplets(3);
return communityUnionService.unionUserAuthentication(unionUserDto);
}
+
+ /**
+ * 用户开门
+ * @param qRCode 二维码字符串
+ * @return 总工会户外劳共用户
+ */
+ @ApiOperation(value = "用户开门")
+ @GetMapping("/openDoor")
+ public R openDoor(@RequestParam(value = "qRCode") String qRCode){
+ return communityUnionService.openDoor(qRCode);
+ }
+
}
--
Gitblit v1.7.1