From eb8c94b58a7df8beb7b39a726533fa572c1341a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=87=E8=88=AA?= <653809315@qq.com> Date: Mon, 27 May 2024 11:28:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/AppCountryController.java | 114 ++++++++++++++++++ .../app/controller/AppLoginController.java | 60 +++++---- .../app/controller/PhoneCodeController.java | 22 +++- .../java/com/ruoyi/app/domain/AppCountry.java | 65 ++++++++++ .../com/ruoyi/app/domain/AppRegister.java | 26 ++++ .../java/com/ruoyi/app/domain/AppUser.java | 9 ++ .../com/ruoyi/app/domain/AppUserDynamic.java | 4 + .../app/domain/vo/AppDynamicCommentVo.java | 8 ++ .../ruoyi/app/domain/vo/AppUserDataVo.java | 2 + .../ruoyi/app/domain/vo/AppUserDynamicVo.java | 3 + .../ruoyi/app/domain/vo/AppUserFriendVo.java | 5 + .../com/ruoyi/app/domain/vo/AppUserVo.java | 14 +++ .../java/com/ruoyi/app/form/RegisterForm.java | 24 ++++ .../ruoyi/app/mapper/AppCountryMapper.java | 61 ++++++++++ .../ruoyi/app/service/IAppCountryService.java | 61 ++++++++++ .../service/impl/AppCountryServiceImpl.java | 93 ++++++++++++++ .../impl/AppDynamicCommentServiceImpl.java | 2 +- .../service/impl/AppProvinceServiceImpl.java | 69 +++-------- .../service/impl/AppRegisterServiceImpl.java | 23 +++- .../impl/AppUserDynamicServiceImpl.java | 16 +++ .../app/service/impl/AppUserServiceImpl.java | 83 +++++++++---- .../app/service/impl/OssServiceImpl.java | 7 +- .../resources/mapper/app/AppCountryMapper.xml | 63 ++++++++++ .../mapper/app/AppDynamicCommentMapper.xml | 4 +- .../mapper/app/AppRegisterMapper.xml | 29 ++++- .../mapper/app/AppUserDynamicMapper.xml | 4 +- .../mapper/app/AppUserFriendMapper.xml | 4 +- .../resources/mapper/app/AppUserMapper.xml | 2 + gan-ui/src/api/app/school.js | 8 ++ gan-ui/src/views/app/school/index.vue | 44 ++++++- 30 files changed, 816 insertions(+), 113 deletions(-) create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppCountryController.java create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppCountry.java create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppCountryMapper.java create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppCountryService.java create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppCountryServiceImpl.java create mode 100644 gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppCountryMapper.xml diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppCountryController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppCountryController.java new file mode 100644 index 0000000..0320086 --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppCountryController.java @@ -0,0 +1,114 @@ +package com.ruoyi.app.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.core.domain.R; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.app.domain.AppCountry; +import com.ruoyi.app.service.IAppCountryService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 国外的国家Controller + * + * @author wyh + * @date 2024-05-26 + */ +@RestController +@RequestMapping("/country") +@Api(tags = "国外的国家" , description = "国外的国家") +public class AppCountryController extends BaseController +{ + @Autowired + private IAppCountryService appCountryService; + + /** + * 查询国外的国家列表 + */ + @RequiresPermissions("app:country:list") + @GetMapping("/list") + @ApiOperation(value = "查询国外的国家", notes = "查询国外的国家", httpMethod = "GET") + public TableDataInfo list(AppCountry appCountry) + { + startPage(); + List list = appCountryService.selectAppCountryList(appCountry); + return getDataTable(list); + } + + /** + * 导出国外的国家列表 + */ + @RequiresPermissions("app:country:export") + @Log(title = "国外的国家", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, AppCountry appCountry) + { + List list = appCountryService.selectAppCountryList(appCountry); + ExcelUtil util = new ExcelUtil(AppCountry.class); + util.exportExcel(response, list, "国外的国家数据"); + } + + /** + * 获取国外的国家详细信息 + */ + @RequiresPermissions("app:country:query") + @GetMapping(value = "/{id}") + @ApiOperation(value = "获取国外的国家详细信息", notes = "获取国外的国家详细信息", httpMethod = "GET") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(appCountryService.selectAppCountryById(id)); + } + + /** + * 新增国外的国家 + */ + @RequiresPermissions("app:country:add") + @ApiOperation(value = "新增国外的国家", notes = "新增国外的国家", httpMethod = "POST") + @Log(title = "国外的国家", businessType = BusinessType.INSERT) + @PostMapping("/add") + public AjaxResult add(@RequestBody AppCountry appCountry) + { + return toAjax(appCountryService.insertAppCountry(appCountry)); + } + + /** + * 修改国外的国家 + */ + @RequiresPermissions("app:country:edit") + @ApiOperation(value = "修改国外的国家", notes = "修改国外的国家", httpMethod = "PUT") + @Log(title = "国外的国家", businessType = BusinessType.UPDATE) + @PutMapping("/edit") + public AjaxResult edit(@RequestBody AppCountry appCountry) + { + return toAjax(appCountryService.updateAppCountry(appCountry)); + } + + /** + * 删除国外的国家 + */ + @RequiresPermissions("app:country:remove") + @Log(title = "国外的国家", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(appCountryService.deleteAppCountryByIds(ids)); + } +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java index d75292a..75cc4b2 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java @@ -69,41 +69,46 @@ public class AppLoginController { @PostMapping("/register") @ApiOperation(value = "注册", notes = "注册") public R register(@RequestBody RegisterForm registerForm) { + //判断用户是否已注册或已存在 AppUser appUser = appUserService.selectAppUserByPhone(registerForm.getPhoneNumber()); - AppRegister register = appRegisterService.selectAppRegisterByphone(registerForm.getPhoneNumber()); + Assert.isNull(appUser, "手机号已注册"); + //查看是否提交过注册申请 + AppRegister register = appRegisterService.selectAppRegisterByphone(registerForm.getPhoneNumber()); Assert.notNull(registerForm.getSchoolId(), "学校id不能为空"); + + + //TODO AppSchool appSchool = schoolService.selectAppSchoolById( registerForm.getSchoolId() ); - Assert.isNull(appUser, "手机号已注册"); - if (StringUtils.isNotEmpty(registerForm.getEmail())) { - //校验邮箱格式 -// Assert.isTrue(MailUtil.validEmail(registerForm.getEmail()), "邮箱格式不正确") ; - AppRegister appRegister = setAppRegister(registerForm); - //校验邮箱是否已注册 - AppUser emailUser = appUserService.selectAppUserByEmail(registerForm.getEmail()); - Assert.isNull(emailUser, "邮箱已注册"); - redisService.setCacheMapValue(IdUtils.fastUUID(),registerForm.getEmail() , registerForm); - try { - String EM = "

欢迎来到我们的服务！！

" - + "

请点击下面的网址确认您的注册:

" - + "

http://101.133.172.2:9204/app/activation/"+ IdUtils.fastUUID() + "/" + registerForm.getEmail() + "

" - + ""; - - MailUtil.send_mail(registerForm.getEmail(), EM); - } catch (MessagingException e) { - throw new RuntimeException(e); - } - } else { +// if (StringUtils.isNotEmpty(registerForm.getEmail())) { +// //校验邮箱格式 +//// Assert.isTrue(MailUtil.validEmail(registerForm.getEmail()), "邮箱格式不正确") ; +// AppRegister appRegister = setAppRegister(registerForm); +// //校验邮箱是否已注册 +// AppUser emailUser = appUserService.selectAppUserByEmail(registerForm.getEmail()); +// Assert.isNull(emailUser, "邮箱已注册"); +// redisService.setCacheMapValue(IdUtils.fastUUID(),registerForm.getEmail() , registerForm); +// try { +// String EM = "

欢迎来到我们的服务！！

" +// + "

请点击下面的网址确认您的注册:

" +// + "

http://101.133.172.2:9204/app/activation/"+ IdUtils.fastUUID() + "/" + registerForm.getEmail() + "

" +// + ""; +// +// MailUtil.send_mail(registerForm.getEmail(), EM); +// } catch (MessagingException e) { +// throw new RuntimeException(e); +// } +// } else { if (register != null && register.getStatus() != null) { switch (register.getStatus()) { case 0: - return R.fail(201, "注册失败，您的账号正在审核中！"); + return R.fail(201, "请等待，您的账号正在审核中！"); case 1: return R.fail(201, "您的账号已通过"); case 2: @@ -116,7 +121,7 @@ public class AppLoginController { int i = appRegisterService.insertAppRegister(appRegister); Assert.isTrue(i > 0, "注册失败"); } - } +// } return R.ok(null, "申请成功,请等待审核结果！"); } @@ -125,6 +130,7 @@ public class AppLoginController { public R login(@RequestBody LoginForm loginForm) { AppUser appUser = appUserService.selectAppUserByPhone(loginForm.getPhoneNumber()); Assert.notNull(appUser, "手机号未注册"); + // Object cacheObject = redisService.getCacheObject(loginForm.getPhoneNumber()); // if (cacheObject != null) { // String code = (String) cacheObject; @@ -145,15 +151,23 @@ public class AppLoginController { private static AppRegister setAppRegister(RegisterForm registerForm) { AppRegister appRegister = new AppRegister(); + appRegister.setPushId(registerForm.getPushId()); + appRegister.setEducation(registerForm.getEducation()); + appRegister.setMajor(registerForm.getMajor()); + appRegister.setCompanyName(registerForm.getCompanyName()); appRegister.setPhone(registerForm.getPhoneNumber()); appRegister.setUsername(registerForm.getUsername()); appRegister.setProve(registerForm.getProve()); appRegister.setAvatarUrl(registerForm.getAvatarUrl()); appRegister.setSex(registerForm.getSex()); appRegister.setAddress(registerForm.getAddress()); + appRegister.setNickname(registerForm.getNickname()); appRegister.setSchoolId(registerForm.getSchoolId()); appRegister.setEmail(registerForm.getEmail()); appRegister.setInvitationCode(registerForm.getInvitationCode()); + appRegister.setProvinceId(registerForm.getProvinceId()); + appRegister.setCityId(registerForm.getCityId()); + appRegister.setTownId(registerForm.getTownId()); appRegister.setStatus(0); return appRegister; } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java index f58c38b..ba5a024 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java @@ -1,6 +1,9 @@ package com.ruoyi.app.controller; +import com.ruoyi.app.domain.AppRegister; +import com.ruoyi.app.service.IAppRegisterService; import com.ruoyi.app.utils.aliyun.sms.SendNoteUtil; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.AjaxResult; import io.swagger.annotations.Api; @@ -21,11 +24,26 @@ public class PhoneCodeController { @Autowired private SendNoteUtil sendNoteUtil; + @Autowired + private IAppRegisterService appRegisterService; + @GetMapping(value = "/send") @ApiOperation(value = "发送短信验证码", notes = "发送短信验证码", httpMethod = "GET") - public AjaxResult sendCode(@RequestParam("phoneNumber") String phoneNum){ + public AjaxResult sendCode(@RequestParam("phoneNumber") String phoneNum , @RequestParam("type") Integer type){ + String send = ""; + if (type == 1) { - String send = sendNoteUtil.sendNoteMessgae(phoneNum); + AppRegister appRegister = appRegisterService.selectAppRegisterByphone(phoneNum); + if (appRegister != null && appRegister.getStatus() == 0) { + return AjaxResult.error(201, "请等待，您的账号正在审核中！"); + } + if (appRegister != null && appRegister.getStatus() == 2) { + return AjaxResult.error(201, "您的账号申请被驳回"); + } + send = sendNoteUtil.sendNoteMessgae(phoneNum); + }else { + send = sendNoteUtil.sendMessage(phoneNum); + } if ("OK".equals(send)) { return AjaxResult.success(); diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppCountry.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppCountry.java new file mode 100644 index 0000000..f583f3d --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppCountry.java @@ -0,0 +1,65 @@ +package com.ruoyi.app.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 国外的国家对象 app_country + * + * @author wyh + * @date 2024-05-26 + */ +public class AppCountry extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Integer id; + + /** 国家名称 */ + @Excel(name = "国家名称") + private String name; + + /** 父级id */ + @Excel(name = "父级id") + private Long parentId; + + public void setId(Integer id) + { + this.id = id; + } + + public Integer getId() + { + return id; + } + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + public Long getParentId() + { + return parentId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("name", getName()) + .append("parentId", getParentId()) + .toString(); + } +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppRegister.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppRegister.java index 91c2d84..5f62437 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppRegister.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppRegister.java @@ -1,5 +1,7 @@ package com.ruoyi.app.domain; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; @@ -11,6 +13,8 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author wyh * @date 2024-04-23 */ + +@Data public class AppRegister extends BaseEntity { private static final long serialVersionUID = 1L; @@ -57,6 +61,28 @@ public class AppRegister extends BaseEntity @Excel(name = "审核状态") private Integer status; + @ApiModelProperty("推送id") + private String pushId; + /** 学历 */ + @Excel(name = "学历") + private String education; + + /** 专业 */ + @Excel(name = "专业") + private String major; + + /** 公司名称 */ + @Excel(name = "公司名称") + private String companyName; + + private String nickname; + + private Integer provinceId; + + private Integer cityId; + + private Integer townId; + public void setId(Long id) { this.id = id; diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java index f833fe6..8e241f4 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java @@ -174,6 +174,8 @@ public class AppUser extends BaseEntity private String backGroundImg; + private String pushId; + /** 订单记录 */ @Excel(name = "订单记录") private Long orderId; @@ -188,6 +190,13 @@ public class AppUser extends BaseEntity @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date orderEndTime; + + private Integer provinceId; + + private Integer cityId; + + private Integer townId; + public void setId(Long id) { this.id = id; diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java index 183e4e9..95410bc 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java @@ -75,6 +75,10 @@ public class AppUserDynamic extends BaseEntity private List dynamicIds; + private Integer check; + + private Boolean isOwner; + public void setIsTop(Long isTop) { this.isTop = isTop; diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppDynamicCommentVo.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppDynamicCommentVo.java index 6ffe5c5..8c58c5b 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppDynamicCommentVo.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppDynamicCommentVo.java @@ -3,6 +3,7 @@ package com.ruoyi.app.domain.vo; import com.ruoyi.app.domain.AppDynamicComment; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -15,6 +16,7 @@ import java.util.List; * @author wyh * @date 2024-04-24 */ +@Data public class AppDynamicCommentVo extends AppDynamicComment { private static final long serialVersionUID = 1L; @@ -25,6 +27,12 @@ public class AppDynamicCommentVo extends AppDynamicComment @Excel(name = "用户头像") private String avatarUrl; + private Integer check; + + /** 昵称 */ + @Excel(name = "昵称") + private String nickname; + private List children = new ArrayList<>(); public void setChildren(List children) { diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDataVo.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDataVo.java index 44d8848..6f88d1c 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDataVo.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDataVo.java @@ -21,6 +21,8 @@ public class AppUserDataVo private static final long serialVersionUID = 1L; private String username; + private String nickname; + private Integer check; private String avatarUrl; diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java index 3c0e368..a889068 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java @@ -25,6 +25,8 @@ public class AppUserDynamicVo extends AppUserDynamic { private static final long serialVersionUID = 1L; + private Integer isFans; + private String username; private String avatarUrl; @@ -66,6 +68,7 @@ public class AppUserDynamicVo extends AppUserDynamic private String townName; + private Integer check; // 话题 private List appTopicList = new ArrayList<>(); diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserFriendVo.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserFriendVo.java index 8520acc..a7e186d 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserFriendVo.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserFriendVo.java @@ -3,6 +3,7 @@ package com.ruoyi.app.domain.vo; import com.ruoyi.app.domain.AppUserFriend; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -12,6 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author wyh * @date 2024-04-24 */ +@Data public class AppUserFriendVo extends AppUserFriend { private static final long serialVersionUID = 1L; @@ -19,6 +21,9 @@ public class AppUserFriendVo extends AppUserFriend /** 我的id */ @Excel(name = "名字") private String username; + private String nickname; + + private Integer check; /** 好友id */ @Excel(name = "头像") diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserVo.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserVo.java index c094918..75a0072 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserVo.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserVo.java @@ -27,6 +27,18 @@ public class AppUserVo extends AppUser @Excel(name = "学校名称") private String schoolName; + private String schoolImg; + + private Integer provinceId; + + private Integer cityId; + + private Integer townId; + + private String provinceName; + + private String townName; + private List userSkillList; private String cityName; @@ -37,6 +49,8 @@ public class AppUserVo extends AppUser private Integer attentionNum; + + private int fansNum; public void setUserSkillList(List userSkillList) { this.userSkillList = userSkillList; diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/RegisterForm.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/RegisterForm.java index 84167a7..1475eaa 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/RegisterForm.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/RegisterForm.java @@ -1,6 +1,7 @@ package com.ruoyi.app.form; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.ruoyi.common.core.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -36,6 +37,29 @@ public class RegisterForm { @ApiModelProperty("学校证明") private String prove; + @ApiModelProperty("推送id") + private String pushId; + /** 学历 */ + @Excel(name = "学历") + private String education; + + /** 专业 */ + @Excel(name = "专业") + private String major; + + /** 公司名称 */ + @Excel(name = "公司名称") + private String companyName; + + private String nickname; + + private Integer provinceId; + + private Integer cityId; + + private Integer townId; + + @JsonIgnore private Integer status; } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppCountryMapper.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppCountryMapper.java new file mode 100644 index 0000000..7ef6284 --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppCountryMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.app.mapper; + +import java.util.List; +import com.ruoyi.app.domain.AppCountry; + +/** + * 国外的国家Mapper接口 + * + * @author wyh + * @date 2024-05-26 + */ +public interface AppCountryMapper +{ + /** + * 查询国外的国家 + * + * @param id 国外的国家主键 + * @return 国外的国家 + */ + public AppCountry selectAppCountryById(Long id); + + /** + * 查询国外的国家列表 + * + * @param appCountry 国外的国家 + * @return 国外的国家集合 + */ + public List selectAppCountryList(AppCountry appCountry); + + /** + * 新增国外的国家 + * + * @param appCountry 国外的国家 + * @return 结果 + */ + public int insertAppCountry(AppCountry appCountry); + + /** + * 修改国外的国家 + * + * @param appCountry 国外的国家 + * @return 结果 + */ + public int updateAppCountry(AppCountry appCountry); + + /** + * 删除国外的国家 + * + * @param id 国外的国家主键 + * @return 结果 + */ + public int deleteAppCountryById(Long id); + + /** + * 批量删除国外的国家 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteAppCountryByIds(Long[] ids); +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppCountryService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppCountryService.java new file mode 100644 index 0000000..ef6be28 --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppCountryService.java @@ -0,0 +1,61 @@ +package com.ruoyi.app.service; + +import java.util.List; +import com.ruoyi.app.domain.AppCountry; + +/** + * 国外的国家Service接口 + * + * @author wyh + * @date 2024-05-26 + */ +public interface IAppCountryService +{ + /** + * 查询国外的国家 + * + * @param id 国外的国家主键 + * @return 国外的国家 + */ + public AppCountry selectAppCountryById(Long id); + + /** + * 查询国外的国家列表 + * + * @param appCountry 国外的国家 + * @return 国外的国家集合 + */ + public List selectAppCountryList(AppCountry appCountry); + + /** + * 新增国外的国家 + * + * @param appCountry 国外的国家 + * @return 结果 + */ + public int insertAppCountry(AppCountry appCountry); + + /** + * 修改国外的国家 + * + * @param appCountry 国外的国家 + * @return 结果 + */ + public int updateAppCountry(AppCountry appCountry); + + /** + * 批量删除国外的国家 + * + * @param ids 需要删除的国外的国家主键集合 + * @return 结果 + */ + public int deleteAppCountryByIds(Long[] ids); + + /** + * 删除国外的国家信息 + * + * @param id 国外的国家主键 + * @return 结果 + */ + public int deleteAppCountryById(Long id); +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppCountryServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppCountryServiceImpl.java new file mode 100644 index 0000000..8506725 --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppCountryServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.app.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.app.mapper.AppCountryMapper; +import com.ruoyi.app.domain.AppCountry; +import com.ruoyi.app.service.IAppCountryService; + +/** + * 国外的国家Service业务层处理 + * + * @author wyh + * @date 2024-05-26 + */ +@Service +public class AppCountryServiceImpl implements IAppCountryService +{ + @Autowired + private AppCountryMapper appCountryMapper; + + /** + * 查询国外的国家 + * + * @param id 国外的国家主键 + * @return 国外的国家 + */ + @Override + public AppCountry selectAppCountryById(Long id) + { + return appCountryMapper.selectAppCountryById(id); + } + + /** + * 查询国外的国家列表 + * + * @param appCountry 国外的国家 + * @return 国外的国家 + */ + @Override + public List selectAppCountryList(AppCountry appCountry) + { + return appCountryMapper.selectAppCountryList(appCountry); + } + + /** + * 新增国外的国家 + * + * @param appCountry 国外的国家 + * @return 结果 + */ + @Override + public int insertAppCountry(AppCountry appCountry) + { + return appCountryMapper.insertAppCountry(appCountry); + } + + /** + * 修改国外的国家 + * + * @param appCountry 国外的国家 + * @return 结果 + */ + @Override + public int updateAppCountry(AppCountry appCountry) + { + return appCountryMapper.updateAppCountry(appCountry); + } + + /** + * 批量删除国外的国家 + * + * @param ids 需要删除的国外的国家主键 + * @return 结果 + */ + @Override + public int deleteAppCountryByIds(Long[] ids) + { + return appCountryMapper.deleteAppCountryByIds(ids); + } + + /** + * 删除国外的国家信息 + * + * @param id 国外的国家主键 + * @return 结果 + */ + @Override + public int deleteAppCountryById(Long id) + { + return appCountryMapper.deleteAppCountryById(id); + } +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicCommentServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicCommentServiceImpl.java index e3e84bc..e0b0a86 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicCommentServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicCommentServiceImpl.java @@ -166,7 +166,7 @@ public class AppDynamicCommentServiceImpl implements IAppDynamicCommentService public static List getChildrenAppDynamicCommentVoById(Long parentId, List AppDynamicCommentVos) { List children = new ArrayList(); for (AppDynamicCommentVo node : AppDynamicCommentVos) { - if (node.getParentId() == parentId) { + if (parentId.equals(node.getParentId())) { //装载parentId对应的子节点 children.add(node); } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppProvinceServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppProvinceServiceImpl.java index 6ff0398..36399f7 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppProvinceServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppProvinceServiceImpl.java @@ -7,9 +7,11 @@ import java.util.Map; import java.util.stream.Collectors; import com.ruoyi.app.domain.AppCity; +import com.ruoyi.app.domain.AppCountry; import com.ruoyi.app.domain.AppTown; import com.ruoyi.app.domain.vo.AreaVo; import com.ruoyi.app.mapper.AppCityMapper; +import com.ruoyi.app.mapper.AppCountryMapper; import com.ruoyi.app.mapper.AppTownMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,6 +36,9 @@ public class AppProvinceServiceImpl implements IAppProvinceService { @Autowired private AppTownMapper appTownMapper; + @Autowired + private AppCountryMapper appCountryMapper; + /** * 查询省数据 * @@ -113,6 +118,7 @@ public class AppProvinceServiceImpl implements IAppProvinceService { areaVo.setIsLeaf(false); List list = new ArrayList<>(); List appCities = appCityMapper.selectAppCityListByProvinceId(appProvince.getId()); + boolean flag = true; for (AppCity appCity : appCities) { if (appCity.getName().equals(areaVo.getName())) { @@ -154,57 +160,22 @@ public class AppProvinceServiceImpl implements IAppProvinceService { } areaVos.add(areaVo); } + areaVos.stream().filter(area -> area.getId()==35).forEach(area -> { + AppCountry appCountry = new AppCountry(); + appCountry.setParentId(35L); + List appCountries = appCountryMapper.selectAppCountryList(appCountry); + List collect = appCountries.stream().map(country -> { + AreaVo areaVo = new AreaVo(); + areaVo.setId(country.getId()); + areaVo.setName(country.getName()); + areaVo.setLevel(2); + return areaVo; + }).collect(Collectors.toList()); + area.setChildren(collect); + area.setIsLeaf(false); + }); return areaVos; -// List collect = appProvinces.stream() -// .map(appProvince -> { -// AreaVo areaVo = new AreaVo(); -// areaVo.setId(appProvince.getId()); -// areaVo.setName(appProvince.getName()); -// areaVo.setLevel(1); -// areaVo.setIsLeaf(false); -// -// List appCities = appCityMapper.selectAppCityListByProvinceId(appProvince.getId()); -// if (appCities == null || appCities.isEmpty()) { -// return areaVo; -// } -// -// List children = appCities.stream() -// .map(appCity -> { -// AreaVo child = new AreaVo(); -// child.setId(appCity.getId()); -// child.setName(appCity.getName()); -// child.setLevel(2); -// child.setIsLeaf(false); -// -// List appTowns = appTownMapper.getTownByCityId(appCity.getId()); -// if (appTowns == null || appTowns.isEmpty()) { -// return child; -// } -// -// List townChildren = appTowns.stream() -//// .filter(!appTown -> !appTown.getId().equals(appCity.getId())) // Filter out where child id is same as parent id -// .map(appTown -> { -// AreaVo townChild = new AreaVo(); -// townChild.setId(appTown.getId()); -// townChild.setName(appTown.getName()); -// townChild.setLevel(3); -// townChild.setIsLeaf(true); -// return townChild; -// }) -// .collect(Collectors.toList()); -// -// child.setChildren(townChildren); -// return child; -// }) -// .collect(Collectors.toList()); -// -// areaVo.setChildren(children); -// return areaVo; -// }) -// .collect(Collectors.toList()); -// -// return collect; } } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java index d3566b5..9f89f14 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java @@ -135,13 +135,30 @@ public class AppRegisterServiceImpl implements IAppRegisterService public int passAppRegister(Long id) { AppRegister appRegister = appRegisterMapper.selectAppRegisterById(id); Assert.isTrue(appRegister != null, "该申请不存在"); - Assert.isTrue(appRegister.getStatus() == 0, "该申请已审核"); + Assert.isTrue( appRegister.getStatus()!= null && appRegister.getStatus() == 0, "该申请已审核"); appRegister.setStatus(1); appRegister.setUpdateTime(DateUtils.getNowDate()); int i = appRegisterMapper.updateAppRegister(appRegister); - if (i != 0) { + if (i > 0) { AppUser appUser = new AppUser(); - BeanUtils.copyBeanProp(appUser, appRegister); + BeanUtils.copyProperties(appRegister, appUser); + appUser.setCreateTime(DateUtils.getNowDate()); + appUser.setUpdateTime(DateUtils.getNowDate()); + appUser.setPhone(appRegister.getPhone() != null ? appRegister.getPhone():null); + appUser.setEmail(appRegister.getEmail() != null ? appRegister.getEmail():null); + appUser.setSchool(appRegister.getSchoolId() != null ? appRegister.getSchoolId():null); + appUser.setUsername(appRegister.getUsername() != null ? appRegister.getUsername():null); + appUser.setAddress(appRegister.getAddress() != null ? appRegister.getAddress():null); + appUser.setSex(Long.valueOf(appRegister.getSex() != null ? appRegister.getSex():null)); + appUser.setAvatarUrl(appRegister.getAvatarUrl() != null ? appRegister.getAvatarUrl():null); + appUser.setCompanyName(appRegister.getCompanyName() != null ? appRegister.getCompanyName():null); + appUser.setEducation(appRegister.getEducation() != null ? appRegister.getEducation():null); + appUser.setMajor(appRegister.getMajor() != null ? appRegister.getMajor():null); + appUser.setPushId(appRegister.getPushId() != null ? appRegister.getPushId():null); + appUser.setNickname(appRegister.getNickname() != null ? appRegister.getNickname():null); + appUser.setProvinceId(appRegister.getProvinceId() != null ? appRegister.getProvinceId():null); + appUser.setCityId(appRegister.getCityId() != null ? appRegister.getCityId():null); + appUser.setTownId(appRegister.getTownId() != null ? appRegister.getTownId():null); appUserMapper.insertAppUser(appUser); } return i; diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java index 60f594a..0a90c27 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.app.service.impl; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -214,6 +215,21 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService AppDynamicComment appDynamicComment = new AppDynamicComment(); appDynamicComment.setDynamicId(id); appUserDynamicVo.setCountComment(appDynamicCommentMapper.selectAppDynamicCommentList(appDynamicComment).size()); + + AppUserFriend appUserFriend = new AppUserFriend(); + appUserFriend.setUserId(appUserDynamic.getUserId()); + List friends = appUserFriendMapper.selectAppUserFriendList(appUserFriend); + if (friends.stream().map(AppUserFriend::getFriendId).collect(Collectors.toList()).contains(appUserDynamicVo.getUserId())) { + appUserDynamicVo.setIsFans(0); + }else { + appUserDynamicVo.setIsFans(1); + } + } + + List collect = new ArrayList<>(); + if (appUserDynamic.getIsOwner() != null) { + collect = list.stream().filter(x -> x.getPrivacyStatus() != 1).collect(Collectors.toList()); + return collect; } return list; } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java index 534c57f..154e5b3 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java @@ -9,6 +9,9 @@ import com.ruoyi.app.domain.vo.AppUserInfoVo; import com.ruoyi.app.domain.vo.AppUserNetVo; import com.ruoyi.app.domain.vo.AppUserVo; import com.ruoyi.app.mapper.*; +import com.ruoyi.app.service.IAppCityService; +import com.ruoyi.app.service.IAppProvinceService; +import com.ruoyi.app.service.IAppTownService; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.bean.BeanUtils; import org.apache.commons.collections4.CollectionUtils; @@ -19,13 +22,12 @@ import com.ruoyi.app.service.IAppUserService; /** * app用户Service业务层处理 - * + * * @author wyh * @date 2024-04-23 */ @Service -public class AppUserServiceImpl implements IAppUserService -{ +public class AppUserServiceImpl implements IAppUserService { @Autowired private AppUserMapper appUserMapper; @@ -44,9 +46,17 @@ public class AppUserServiceImpl implements IAppUserService @Autowired private AppSkillMapper appSkillMapper; + @Autowired + private AppProvinceMapper appProvinceMapper; + @Autowired + private AppCityMapper appCityMapper; + + @Autowired + private AppTownMapper appTownMapper; + /** * 查询app用户 - * + * * @param id app用户主键 * @return app用户 */ @@ -54,11 +64,37 @@ public class AppUserServiceImpl implements IAppUserService public AppUserVo selectAppUserById(Long id) { AppUserVo appUser = appUserMapper.selectAppUserById(id); List appSkills = new ArrayList<>(); - if (appUser.getSkillId() != null) { - List skillIds = Arrays.asList(appUser.getSkillId().split(",")); - for (String skillId : skillIds) { - AppSkill appSkill = appSkillMapper.selectAppSkillById(Long.valueOf(skillId)); - appSkills.add(appSkill); +// if (appUser.getSkillId() != null) { +// List skillIds = Arrays.asList(appUser.getSkillId().split(",")); +// for (String skillId : skillIds) { +// AppSkill appSkill = appSkillMapper.selectAppSkillById(Long.valueOf(skillId)); +// appSkills.add(appSkill); +// } +// } + if (appUser.getSchool() != null) { + AppSchool appSchool = appSchoolMapper.selectAppSchoolById(appUser.getSchool()); + if (appSchool != null) { + appUser.setSchoolName(appSchool.getName()); + appUser.setSchoolImg(appSchool.getSchoolImg()); + } + } + + if (appUser.getProvinceId() != null) { + AppProvince appProvince = appProvinceMapper.selectAppProvinceById(appUser.getProvinceId()); + if (appProvince != null) { + appUser.setProvinceName(appProvince.getName()); + } + } + if (appUser.getCityId() != null) { + AppCity appCity = appCityMapper.selectAppCityById(Long.valueOf(appUser.getCityId())); + if (appCity != null) { + appUser.setCityName(appCity.getName()); + } + } + if (appUser.getTownId() != null) { + AppTown appTown = appTownMapper.selectAppTownById(Long.valueOf(appUser.getTownId())); + if (appTown != null) { + appUser.setTownName(appTown.getName()); } } appUser.setUserSkillList(appSkills); @@ -67,13 +103,12 @@ public class AppUserServiceImpl implements IAppUserService /** * 查询app用户列表 - * + * * @param appUser app用户 * @return app用户 */ @Override - public List selectAppUserList(AppUser appUser) - { + public List selectAppUserList(AppUser appUser) { List appUsers = appUserMapper.selectAppUserList(appUser); List appUserVos = new ArrayList<>(); if (CollectionUtils.isNotEmpty(appUsers)) { @@ -95,26 +130,24 @@ public class AppUserServiceImpl implements IAppUserService /** * 新增app用户 - * + * * @param appUser app用户 * @return 结果 */ @Override - public int insertAppUser(AppUser appUser) - { + public int insertAppUser(AppUser appUser) { appUser.setCreateTime(DateUtils.getNowDate()); return appUserMapper.insertAppUser(appUser); } /** * 修改app用户 - * + * * @param appUser app用户 * @return 结果 */ @Override - public int updateAppUser(AppUser appUser) - { + public int updateAppUser(AppUser appUser) { appUser.setUpdateTime(DateUtils.getNowDate()); /*if (StringUtils.isNotBlank(appUser.getSkills())) { // 删除标签 @@ -133,7 +166,7 @@ public class AppUserServiceImpl implements IAppUserService /** * 批量删除app用户 - * + * * @param ids 需要删除的app用户主键 * @return 结果 */ @@ -147,7 +180,7 @@ public class AppUserServiceImpl implements IAppUserService /** * 删除app用户信息 - * + * * @param id app用户主键 * @return 结果 */ @@ -173,7 +206,7 @@ public class AppUserServiceImpl implements IAppUserService AppUserFriend appUserFriend = new AppUserFriend(); appUserFriend.setUserId(appUser.getAppId()); List appUserFriends = appUserFriendMapper.selectAppUserFriendList(appUserFriend); - List ids = appUserFriends.stream().map(x->x.getFriendId()).collect(Collectors.toList()); + List ids = appUserFriends.stream().map(x -> x.getFriendId()).collect(Collectors.toList()); AppUser entity = new AppUser(); entity.setIds(ids); @@ -223,25 +256,25 @@ public class AppUserServiceImpl implements IAppUserService public List listUser(AppUser appUser) { int status = appUser.getStatus(); List ids = new ArrayList<>(); - switch (status){ + switch (status) { case 1://好友 AppUserFriend appUserFriend = new AppUserFriend(); appUserFriend.setUserId(appUser.getAppId()); List list = appUserFriendMapper.selectAppUserFriendList(appUserFriend); - ids = list.stream().map(x->x.getFriendId()).collect(Collectors.toList()); + ids = list.stream().map(x -> x.getFriendId()).collect(Collectors.toList()); break; case 2://关注 AppUserFans appUserFans = new AppUserFans(); appUserFans.setUserId(appUser.getAppId()); List userFans = appUserFansMapper.selectAppUserFansList(appUserFans); - ids = userFans.stream().map(x->x.getFriendId()).collect(Collectors.toList()); + ids = userFans.stream().map(x -> x.getFriendId()).collect(Collectors.toList()); break; case 3://粉丝 appUserFans = new AppUserFans(); appUserFans.setUserId(null); appUserFans.setFriendId(appUser.getAppId()); userFans = appUserFansMapper.selectAppUserFansList(appUserFans); - ids = userFans.stream().map(x->x.getFriendId()).collect(Collectors.toList()); + ids = userFans.stream().map(x -> x.getFriendId()).collect(Collectors.toList()); break; } appUser.setIds(ids); diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/OssServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/OssServiceImpl.java index 310bee3..2bfcd47 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/OssServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/OssServiceImpl.java @@ -30,12 +30,11 @@ public class OssServiceImpl implements OssService { try { //4、 创建OSSClient实例。 OSS ossClient = new OSSClientBuilder().build(schema + endpoint, accessKeyId, accessKeySecret); - String fileName = file.getOriginalFilename();//获取上传文件的名称 + String fileName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));//获取上传文件的名称 InputStream inputStream = file.getInputStream(); // 通过ossClient上传文件： 参数1：桶名， 参数2：上传后的文件路径+文件名 ,参数3：要上传的文件流 String objectName = new DateTime().toString("yyyy/MM/dd/") + - UUID.randomUUID().toString().replace("-", "").substring(0, 16) + - "_" + fileName;//使用UUID+源文件名称后缀拼接生成objectName + UUID.randomUUID().toString().replace("-", "").substring(0, 16) + fileName;//使用UUID+源文件名称后缀拼接生成objectName ossClient.putObject(bucketName, objectName, inputStream); // 关闭OSSClient。 ossClient.shutdown(); @@ -61,7 +60,7 @@ public class OssServiceImpl implements OssService { InputStream inputStream = file.getInputStream(); // 通过ossClient上传文件： 参数1：桶名， 参数2：上传后的文件路径+文件名 ,参数3：要上传的文件流 String objectName = new DateTime().toString("yyyy/MM/dd/") + - UUID.randomUUID().toString().replace("-", "").substring(0, 16) + + UUID.randomUUID().toString().replace("-", "").substring(0, 8) + "_" + fileName;//使用UUID+源文件名称后缀拼接生成objectName ossClient.putObject(bucketName, objectName, inputStream); // 关闭OSSClient。 diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppCountryMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppCountryMapper.xml new file mode 100644 index 0000000..5ff2a1b --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppCountryMapper.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + select id, name, parent_id from app_country + + + + + + + + insert into app_country + + id, + name, + parent_id, + + + #{id}, + #{name}, + #{parentId}, + + + + + update app_country + + name = #{name}, + parent_id = #{parentId}, + + where id = #{id} + + + + delete from app_country where id = #{id} + + + + delete from app_country where id in + + #{id} + + + \ No newline at end of file diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppDynamicCommentMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppDynamicCommentMapper.xml index d2007e7..7407b96 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppDynamicCommentMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppDynamicCommentMapper.xml @@ -32,7 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.content as "content", a.create_time as "createTime", u.username as "username", - u.avatar_url as "avatarUrl" + u.avatar_url as "avatarUrl", + u.`check` as "check", + u.nickname as "nickname" from app_dynamic_comment a LEFT JOIN app_user u on u.id = a.user_id where a.dynamic_id = #{dynamicId} diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml index 8b007bf..d48ef42 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml @@ -21,10 +21,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + - select id, phone, create_time, update_time, create_by, updateBy, remark, username, prove, avatar_url, sex, address, school_id, email ,invitation_code ,status from app_register + select id, phone, create_time, update_time, create_by, updateBy, remark, username, prove, avatar_url, sex, address, school_id, email ,invitation_code ,status , push_id , education , major , company_name , nickname from app_register select a.id as "id",a.user_id as "userId",a.friend_id as "friendId",a.status as "status",a.create_time as "createTime", u.username as "username", - u.avatar_url as "avatarUrl" + u.avatar_url as "avatarUrl", + u.nickname as "nickname", + u.`check` as "check" from app_user_friend a left join app_user u on u.id = a.friend_id diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml index 6698b21..b000efa 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml @@ -140,6 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" s.name as "schoolName", t.name as "cityName", a.id as "userId", + a.job_end_time as "jobEndTime", count(DISTINCT(r.id)) as "friendNum", count(DISTINCT(l.id)) as "likeNum", count(DISTINCT(f.id)) as "attentionNum", @@ -317,6 +318,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" education = #{education}, school = #{school}, major = #{major}, + is_member = #{isMember}, start_time = #{startTime}, end_time = #{endTime}, experience = #{experience}, diff --git a/gan-ui/src/api/app/school.js b/gan-ui/src/api/app/school.js index d7277cd..7b0f1e3 100644 --- a/gan-ui/src/api/app/school.js +++ b/gan-ui/src/api/app/school.js @@ -42,3 +42,11 @@ export function delSchool(id) { method: 'delete' }) } + +export function uploadAvatar(data) { + return request({ + url: '/api/oss/upload', + method: 'post', + data: data + }) +} diff --git a/gan-ui/src/views/app/school/index.vue b/gan-ui/src/views/app/school/index.vue index 8aab2ed..61c96d4 100644 --- a/gan-ui/src/views/app/school/index.vue +++ b/gan-ui/src/views/app/school/index.vue @@ -107,6 +107,20 @@ + + + + + + + + +
确 定 @@ -117,7 +131,7 @@ + + + +