From 13c0e173eeaede98217ecca45f09c74a863f3175 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期二, 21 三月 2023 14:46:45 +0800
Subject: [PATCH] ok
---
src/main/java/com/example/jz/controller/WxAppController.java | 144 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 131 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/WxAppController.java b/src/main/java/com/example/jz/controller/WxAppController.java
index c936a00..207acea 100644
--- a/src/main/java/com/example/jz/controller/WxAppController.java
+++ b/src/main/java/com/example/jz/controller/WxAppController.java
@@ -11,9 +11,7 @@
import com.example.jz.dao.UserDao;
import com.example.jz.modle.R;
import com.example.jz.modle.entity.*;
-import com.example.jz.modle.vo.CauseVo;
-import com.example.jz.modle.vo.MemberVo;
-import com.example.jz.modle.vo.ReportVo;
+import com.example.jz.modle.vo.*;
import com.example.jz.service.*;
import com.example.jz.utils.HttpUtil;
import lombok.SneakyThrows;
@@ -27,6 +25,7 @@
import org.springframework.web.client.RestTemplate;
import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
@RestController
@@ -71,9 +70,8 @@
@Autowired
PublicityService publicityService;
- @GetMapping("/login")
- @SneakyThrows
- public R login(@RequestParam String code, @RequestParam String phoneNumberCode) {
+ @GetMapping("/checkIdentity")
+ public R checkIdentity(@RequestParam String code, @RequestParam String phoneNumberCode) throws Exception {
//灏忕▼搴忕櫥褰昽penid
Map<String, Object> pathUrl = new HashMap<>();
pathUrl.put("appid", appid);
@@ -102,14 +100,92 @@
JSONObject entries = JSONUtil.parseObj(response.getBody());
PhoneInFo phone_info = entries.get("phone_info", PhoneInFo.class);
User user = userDao.selectOne(new QueryWrapper<User>().eq("user_mobile", phone_info.getPurePhoneNumber()));
+ if(Objects.isNull(user)){
+ return R.ok(2, phone_info.getPurePhoneNumber());
+ }else {
+ if (user.getRole() == 1){
+ return R.ok(1, phone_info.getPurePhoneNumber());
+ } else {
+ return R.ok(0, phone_info.getPurePhoneNumber());
+ }
+ }
+ }
+
+// @GetMapping("/login")
+// @SneakyThrows
+// public R login(@RequestParam String code, @RequestParam String phoneNumberCode) {
+// //灏忕▼搴忕櫥褰昽penid
+// Map<String, Object> pathUrl = new HashMap<>();
+// pathUrl.put("appid", appid);
+// pathUrl.put("secret", secret);
+// pathUrl.put("js_code", code);
+// pathUrl.put("grant_type", grant_type);
+// JSONObject result = JSONUtil.parseObj(HttpUtil.doGet(wxApp_userCode_verify_url, pathUrl));
+//
+// //鎵嬫満鍙风爜鐨刟ccess token
+// Map<String, Object> accessToken = new HashMap<>();
+// accessToken.put("appid", appid);
+// accessToken.put("secret", secret);
+// accessToken.put("grant_type", "client_credential");
+// JSONObject accessTokenResult = JSONUtil.parseObj(HttpUtil.doGet(wxApp_accessToken_verify_url, accessToken));
+//
+// //鐢佃瘽鍙风爜
+// String url = wxApp_phoneNumber_verify_url + "?access_token=" + accessTokenResult.get("access_token");
+// Map<String, Object> phoneNumber = new HashMap<>();
+// phoneNumber.put("code", phoneNumberCode);
+//
+// HttpHeaders headers = new HttpHeaders();
+// HttpEntity httpEntity = new HttpEntity<>(phoneNumber, headers);
+// System.out.println(httpEntity);
+// ResponseEntity response = restTemplate.postForEntity(url, httpEntity, Object.class);
+// response.getBody();
+// JSONObject entries = JSONUtil.parseObj(response.getBody());
+// PhoneInFo phone_info = entries.get("phone_info", PhoneInFo.class);
+// User user = userDao.selectOne(new QueryWrapper<User>().eq("user_mobile", phone_info.getPurePhoneNumber()));
+// String token;
+// Integer role;
+// Integer id = null;
+// if (user == null || user.getId() == null) {
+// User newUser = new User();
+// newUser.setUserMobile(phone_info.getPurePhoneNumber());
+// newUser.setUserRegtime(new Date());
+// newUser.setOpenid(result.get("openid").toString());
+// newUser.setStatus(1);
+// newUser.setRole(0);
+// newUser.setCtime(new Date());
+// userService.save(newUser);
+// token = tokenJwtManager.createToken(newUser);
+// role = 0;
+// id = newUser.getId();
+// } else {
+// user.setOpenid(result.get("openid").toString());
+// user.setUserLasttime(new Date());
+// userDao.updateById(user);
+// token = tokenJwtManager.createToken(user);
+// role = user.getRole();
+// id = user.getId();
+// }
+// User user1 = userDao.selectOne(new QueryWrapper<User>().eq("user_mobile", phone_info.getPurePhoneNumber()));
+// HashMap<String, Object> loginMessage = new HashMap<>();
+// loginMessage.put("id", id);
+// loginMessage.put("token", token);
+// loginMessage.put("role", role);
+// loginMessage.put("time", user1.getUserIdcard());
+// return R.ok(loginMessage);
+// }
+
+ @GetMapping("/login")
+ @SneakyThrows
+ public R login(@RequestParam String phone) {
+ User user = userDao.selectOne(new QueryWrapper<User>().eq("user_mobile", phone));
String token;
Integer role;
Integer id = null;
if (user == null || user.getId() == null) {
User newUser = new User();
- newUser.setUserMobile(phone_info.getPurePhoneNumber());
+ newUser.setUserMobile(phone);
newUser.setUserRegtime(new Date());
- newUser.setOpenid(result.get("openid").toString());
+ newUser.setOpenid(phone);
newUser.setStatus(1);
newUser.setRole(0);
newUser.setCtime(new Date());
@@ -118,14 +194,13 @@
role = 0;
id = newUser.getId();
} else {
- user.setOpenid(result.get("openid").toString());
user.setUserLasttime(new Date());
userDao.updateById(user);
token = tokenJwtManager.createToken(user);
role = user.getRole();
id = user.getId();
}
- User user1 = userDao.selectOne(new QueryWrapper<User>().eq("user_mobile", phone_info.getPurePhoneNumber()));
+ User user1 = userDao.selectOne(new QueryWrapper<User>().eq("user_mobile", phone));
HashMap<String, Object> loginMessage = new HashMap<>();
loginMessage.put("id", id);
loginMessage.put("token", token);
@@ -154,12 +229,31 @@
@GetMapping("/user/cause")
public R getCause(Integer id) {
- return R.ok(reportService.list(new QueryWrapper<Report>().eq("user_id", id)));
+ List<Report> reports = reportService.list(new QueryWrapper<Report>().eq("user_id", id));
+ List<ReportVXVO> res = reports.stream()
+ .map(item -> {
+ ReportVXVO res1 = new ReportVXVO();
+ BeanUtils.copyProperties(item, res1);
+ if (!Objects.isNull(causeService.getById(item.getCauseId()))){
+ res1.setReportDescription(causeService.getById(item.getCauseId()).getName());
+ }
+ return res1;
+ }).collect(Collectors.toList());
+ return R.ok(res);
}
@PostMapping("/user/addReport")
- public R addReport(@RequestBody Report report) {
- User user = userService.getOne(new QueryWrapper<User>().eq("id", report.getUserId()));
+ public R addReport(@RequestBody ReportVXVO reportVXVO) {
+ User user = userService.getOne(new QueryWrapper<User>().eq("id", reportVXVO.getUserId()));
+ user.setRealName(reportVXVO.getRealName());
+ user.setUserIdcard(reportVXVO.getUserIdCard());
+ user.setLocation(reportVXVO.getLocation());
+ user.setSex(reportVXVO.getSex());
+ user.setWorkingLocation(reportVXVO.getWorkingLocation());
+ userService.update(user, new LambdaQueryWrapper<User>().eq(User::getId, user.getId()));
+ Report report = new Report();
+ BeanUtils.copyProperties(reportVXVO, report);
+ report.setAmountInvolved(reportVXVO.getAmountInvolved());
report.setPic(user.getPic());
report.setIsInGroup(0);
report.setCtime(new Date());
@@ -193,6 +287,27 @@
});
}
return R.ok(list);
+ }
+
+ @GetMapping("/isExist")
+ public R isExist(@RequestParam String phone){
+ User one = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getUserMobile, phone));
+ if(Objects.isNull(one)){
+ return R.ok(false, "璇ユ墜鏈哄彿娌℃湁琚敞鍐�");
+ }else {
+ return R.ok(true, "璇ユ墜鏈哄彿宸茶娉ㄥ唽");
+ }
+ }
+
+ /**
+ * 鏄剧ず鐢ㄦ埛淇℃伅
+ */
+ @GetMapping("/getGroupUserInfo")
+ public R getGroupUserInfo(@RequestParam Integer id){
+ User one = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getId, id));
+ MessageUserInfoVO messageUserInfoVO = new MessageUserInfoVO();
+ BeanUtils.copyProperties(messageUserInfoVO, one);
+ return R.ok(messageUserInfoVO);
}
private void getMessage(HashMap<String, Object> groupMap, List<Message> message) {
@@ -250,6 +365,7 @@
messageMap.put("id", user.getId());
messageMap.put("name", item.getReportName());
messageMap.put("mobile", user.getUserMobile());
+ messageMap.put("idcard", user.getUserIdcard());
messageMap.put("pic", user.getPic());
messageMap.put("role", 0);
} else {
@@ -400,6 +516,8 @@
return R.ok(messageService.save(message));
}
+
+
@GetMapping("/group/user/sendMsg")
public R sendUserMsg(@RequestParam Integer id, @RequestParam Integer groupId, @RequestParam String msg) {
if (StringUtils.isBlank(msg)) {
--
Gitblit v1.8.0