|
|
|
@ -25,7 +25,6 @@ import com.sztzjy.fund_investment.util.RsaUtil;
|
|
|
|
|
import com.sztzjy.fund_investment.util.TzApi;
|
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.http.HttpStatus;
|
|
|
|
|
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
|
|
|
@ -187,9 +186,8 @@ public class UserController {
|
|
|
|
|
flow1.setFlowId(uuid);
|
|
|
|
|
flowMapper.insert(flow1);
|
|
|
|
|
map.put("flowId", uuid);
|
|
|
|
|
} else {
|
|
|
|
|
map.put("flowId", flow.getFlowId());
|
|
|
|
|
}
|
|
|
|
|
map.put("flowId", flow.getFlowId());
|
|
|
|
|
return new ResultEntity(HttpStatus.OK, map);
|
|
|
|
|
} else { // 2、智云单点登录
|
|
|
|
|
JwtUser jwtUser;
|
|
|
|
@ -211,6 +209,16 @@ public class UserController {
|
|
|
|
|
map.put("schoolId", loginResult.getSchoolId());
|
|
|
|
|
map.put("classId", loginResult.getClassId());
|
|
|
|
|
map.put("userId", loginResult.getUserId());
|
|
|
|
|
Flow flow = flowMapper.selectByPrimaryKey(jwtUser.getUserId());
|
|
|
|
|
if (flow == null) {
|
|
|
|
|
String uuid = String.valueOf(UUID.randomUUID());
|
|
|
|
|
Flow flow1 = new Flow();
|
|
|
|
|
flow1.setUserid(jwtUser.getUserId());
|
|
|
|
|
flow1.setFlowId(uuid);
|
|
|
|
|
flowMapper.insert(flow1);
|
|
|
|
|
map.put("flowId", uuid);
|
|
|
|
|
}
|
|
|
|
|
map.put("flowId", flow.getFlowId());
|
|
|
|
|
return new ResultEntity(HttpStatus.OK, map);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|