From f6b300cbdff1dbb8fdd048c710457818f4cf9938 Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Fri, 5 Jan 2024 14:08:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=80=E5=87=BA=E6=97=B6?= =?UTF-8?q?=E6=9C=BA=E8=A1=A8=EF=BC=8C=E5=AE=8C=E6=88=90=E6=8A=95=E8=B5=84?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserController.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/sztzjy/fund_investment/controller/UserController.java b/src/main/java/com/sztzjy/fund_investment/controller/UserController.java index 6f17c0a..cacc592 100644 --- a/src/main/java/com/sztzjy/fund_investment/controller/UserController.java +++ b/src/main/java/com/sztzjy/fund_investment/controller/UserController.java @@ -104,15 +104,16 @@ public class UserController { String dis = accessToken.get("dis"); User user = userMapper.selectByUn(un); String newUUID = IdUtil.simpleUUID(); - String flowId = IdUtil.simpleUUID(); if (user != null) { - Map map = getStringObjectMap(access_token, un, dis, newUUID, flowId); + Flow flow = flowMapper.selectByPrimaryKey(user.getUserid()); + Map map = getStringObjectMap(access_token, un, dis, newUUID, flow.getFlowId()); user.setAccessToken(access_token); userMapper.updateByPrimaryKey(user); return new ResultEntity(HttpStatus.OK, map); } User newUser = new User(); - newUser.setUserid(IdUtil.simpleUUID()); + String flowId = IdUtil.simpleUUID(); + newUser.setUserid(newUUID); newUser.setRoleId(4); newUser.setLoginType(0); newUser.setAccessToken(access_token); @@ -126,6 +127,10 @@ public class UserController { newUser.setClassName("国家虚拟仿真训练班"); Map map = getStringObjectMap(access_token, un, dis, newUUID, flowId); userMapper.insert(newUser); + Flow flow = new Flow(); + flow.setUserid(newUUID); + flow.setFlowId(flowId); + flowMapper.insert(flow); return new ResultEntity(HttpStatus.OK, map); } } @@ -150,11 +155,8 @@ public class UserController { map.put("roleId", 4); map.put("schoolId", "999999999"); map.put("classId", "999999999"); - Flow flow = new Flow(); - flow.setUserid(newUUID); - flow.setFlowId(flowId); - flowMapper.insert(flow); map.put("flowId", flowId); + map.put("userId", newUUID); return map; }