From 0a899ea2d2da78a0b7eb88bac854e767a759fa13 Mon Sep 17 00:00:00 2001 From: penny <2500338766@qq.com> Date: Sun, 8 May 2022 22:54:16 +0800 Subject: [PATCH] =?UTF-8?q?feature1.0.0=EF=BC=9A=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bnyer/file/config/MinioConfig.java | 2 + .../file/controller/SysFileController.java | 51 ++++++++---------- .../service/FastDfsSysFileServiceImpl.java | 42 --------------- .../file/service/LocalSysFileServiceImpl.java | 50 ----------------- .../com/bnyer/file/service/MinioService.java | 2 + .../file/service/MinioSysFileServiceImpl.java | 4 +- .../java/com/bnyer/file/utils/ImgUtil.java | 4 +- .../bnyer/img/constants/TiktokConstant.java | 4 +- .../img/controller/TiktokMiniController.java | 33 +++++++----- .../img/controller/TiktokUserController.java | 22 +++++--- .../java/com/bnyer/img/domain/TiktokUser.java | 7 +++ .../java/com/bnyer/img/dto/BannerPageDto.java | 3 ++ .../com/bnyer/img/dto/TiktokCreaterDto.java | 4 ++ .../java/com/bnyer/img/dto/TiktokUserDto.java | 11 ++-- .../com/bnyer/img/dto/TiktokUserMiniDto.java | 38 +++++++++++++ .../com/bnyer/img/dto/TiktokUserPageDto.java | 3 ++ .../bnyer/img/mapper/TiktokUserMapper.java | 9 ++++ .../bnyer/img/service/TiktokUserService.java | 16 +++--- .../img/service/impl/BannerServiceImpl.java | 5 +- .../service/impl/TiktokUserServiceImpl.java | 53 +++++++++++-------- .../java/com/bnyer/img/vo/TiktokUserVo.java | 3 ++ .../com/bnyer/img/mapper/TiktokUserMapper.xml | 35 +++++++++++- 22 files changed, 213 insertions(+), 188 deletions(-) delete mode 100644 bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/FastDfsSysFileServiceImpl.java delete mode 100644 bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/LocalSysFileServiceImpl.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserMiniDto.java diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/config/MinioConfig.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/config/MinioConfig.java index c8a688c..9167725 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/config/MinioConfig.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/config/MinioConfig.java @@ -1,6 +1,7 @@ package com.bnyer.file.config; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import io.minio.MinioClient; @@ -11,6 +12,7 @@ import io.minio.MinioClient; * @author ruoyi */ @Configuration +@RefreshScope @ConfigurationProperties(prefix = "minio") public class MinioConfig { diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java index 6f2775e..32a0aae 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java @@ -2,16 +2,22 @@ package com.bnyer.file.controller; import com.bnyer.common.core.domain.R; import com.bnyer.common.core.utils.file.FileUtils; +import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.file.service.ISysFileService; import com.bnyer.file.service.MinioService; +import com.bnyer.file.utils.FileUploadUtils; import com.bnyer.system.api.domain.SysFile; +import org.apache.tomcat.jni.FileInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -25,45 +31,20 @@ public class SysFileController { private static final Logger log = LoggerFactory.getLogger(SysFileController.class); - @Autowired - private ISysFileService sysFileService; - @Autowired private MinioService minioService; /** - * 文件上传请求 - */ - @PostMapping("upload") - public R upload(MultipartFile file) - { - try - { - // 上传并返回访问地址 - String url = sysFileService.uploadFile(file); - SysFile sysFile = new SysFile(); - sysFile.setName(FileUtils.getName(url)); - sysFile.setUrl(url); - return R.ok(sysFile); - } - catch (Exception e) - { - log.error("上传文件失败", e); - return R.fail(e.getMessage()); - } - } - - /** - * 批量压缩上传图片 + * 批量上传图片 */ - @PostMapping("uploadBatch") + @PostMapping("/uploadBatch") public R> uploadBatch(MultipartFile[] files) { try { List list = new ArrayList<>(); for (MultipartFile file : files) { - String url = minioService.uploadFileByThumb(file); + String url = minioService.uploadFile(file); list.add(url); } // 上传并返回访问地址 @@ -72,7 +53,19 @@ public class SysFileController catch (Exception e) { log.error("上传文件失败", e); - return R.fail(e.getMessage()); + return R.fail("上传文件失败"); + } + } + + @PostMapping("/upload") + @ResponseBody + public R upload(@RequestParam("file") MultipartFile file) { + String url = null; + try{ + url = minioService.uploadFile(file); + }catch (Exception e){ + return R.fail("文件上传失败!"); } + return R.ok(url); } } \ No newline at end of file diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/FastDfsSysFileServiceImpl.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/FastDfsSysFileServiceImpl.java deleted file mode 100644 index e52ac42..0000000 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/FastDfsSysFileServiceImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.bnyer.file.service; - -import org.apache.commons.io.FilenameUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; -import com.github.tobato.fastdfs.domain.fdfs.StorePath; -import com.github.tobato.fastdfs.service.FastFileStorageClient; - -/** - * FastDFS 文件存储 - * - * @author ruoyi - */ -@Service -public class FastDfsSysFileServiceImpl implements ISysFileService -{ - /** - * 域名或本机访问地址 - */ - @Value("${fdfs.domain}") - public String domain; - - @Autowired - private FastFileStorageClient storageClient; - - /** - * FastDfs文件上传接口 - * - * @param file 上传的文件 - * @return 访问地址 - * @throws Exception - */ - @Override - public String uploadFile(MultipartFile file) throws Exception - { - StorePath storePath = storageClient.uploadFile(file.getInputStream(), file.getSize(), - FilenameUtils.getExtension(file.getOriginalFilename()), null); - return domain + "/" + storePath.getFullPath(); - } -} diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/LocalSysFileServiceImpl.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/LocalSysFileServiceImpl.java deleted file mode 100644 index e72c549..0000000 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/LocalSysFileServiceImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.bnyer.file.service; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; -import com.bnyer.file.utils.FileUploadUtils; - -/** - * 本地文件存储 - * - * @author ruoyi - */ -@Primary -@Service -public class LocalSysFileServiceImpl implements ISysFileService -{ - /** - * 资源映射路径 前缀 - */ - @Value("${file.prefix}") - public String localFilePrefix; - - /** - * 域名或本机访问地址 - */ - @Value("${file.domain}") - public String domain; - - /** - * 上传文件存储在本地的根路径 - */ - @Value("${file.path}") - private String localFilePath; - - /** - * 本地文件上传接口 - * - * @param file 上传的文件 - * @return 访问地址 - * @throws Exception - */ - @Override - public String uploadFile(MultipartFile file) throws Exception - { - String name = FileUploadUtils.upload(localFilePath, file); - String url = domain + localFilePrefix + name; - return url; - } -} diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/MinioService.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/MinioService.java index 17fea5b..15c23c3 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/MinioService.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/MinioService.java @@ -19,6 +19,8 @@ public interface MinioService { */ public String uploadFile(MultipartFile file) throws Exception; + + /** * 压缩图片上传 * @param file 文件 diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/MinioSysFileServiceImpl.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/MinioSysFileServiceImpl.java index 2379b47..94021fd 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/MinioSysFileServiceImpl.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/MinioSysFileServiceImpl.java @@ -51,7 +51,7 @@ public class MinioSysFileServiceImpl implements MinioService @Override public String uploadFileByThumb(MultipartFile file) throws Exception { - boolean b = ImgUtil.isPicture(file.getName()); + boolean b = ImgUtil.isPicture(file.getOriginalFilename()); if(!b){ throw new ServiceException("文件类型不是图片类型,上传失败！"); } @@ -62,7 +62,7 @@ public class MinioSysFileServiceImpl implements MinioService MultipartFile multipartFile = ImgUtil.getMultipartFile(inputStream, fileName); PutObjectArgs args = PutObjectArgs.builder() .bucket(minioConfig.getBucketName()) - .object(multipartFile.getName()) + .object(fileName) .stream(multipartFile.getInputStream(), multipartFile.getSize(), -1) .contentType(multipartFile.getContentType()) .build(); diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/utils/ImgUtil.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/utils/ImgUtil.java index 6dfb9ed..a013890 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/utils/ImgUtil.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/utils/ImgUtil.java @@ -119,9 +119,11 @@ public class ImgUtil { if (StringUtils.isBlank(imgName)) { return false; } + String[] split = imgName.split("\\."); + String subName = split[1]; String[] arr = {"bmp", "dib", "gif", "jfif", "jpe", "jpeg", "jpg", "png", "tif", "tiff", "ico"}; for (String item : arr) { - if (item.equals(imgName)) { + if (item.equals(subName)) { flag = true; break; } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/TiktokConstant.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/TiktokConstant.java index 1dca570..31b6532 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/TiktokConstant.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/TiktokConstant.java @@ -12,9 +12,9 @@ public class TiktokConstant { public static final String SUCCESS = "0"; /** - * 成为艺术家未绑定手机号 + * 成为艺术家已绑定手机号 */ - public static final Integer UN_BIND_PHONE = 105001; + public static final Integer BINDED_PHONE = 105001; /** * 绑定手机号失败 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java index 9ac01ea..2ac9ba7 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java @@ -56,7 +56,7 @@ public class TiktokMiniController extends BaseController { @ApiOperation(value="新增feedback") @PostMapping(value = "/insertFeedback") public AjaxResult insertFeedback(@Validated @RequestBody @ApiParam("feedback对象") FeedBackDto dto){ - log.debug("新增feedback参数为:{}", JSON.toJSONString(dto)); + log.info("新增feedback参数为:{}", JSON.toJSONString(dto)); Feedback feedback = dto.extractParam(); feedback.setSource("0"); return AjaxResult.success(feedBackService.insert(feedback)); @@ -73,7 +73,7 @@ public class TiktokMiniController extends BaseController { @ApiOperation(value="新增TiktokImg") @PostMapping(value = "/insertTiktokImg") public AjaxResult insertTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgMiniDto dto){ - log.debug("抖音小程序端用户【{}】新增TiktokImg参数为:{}",dto.getUserId(),JSON.toJSONString(dto)); + log.info("抖音小程序端用户【{}】新增TiktokImg参数为:{}",dto.getUserId(),JSON.toJSONString(dto)); TiktokImg tiktokImg = dto.extractParam(); tiktokImg.setStatus("0"); return AjaxResult.success(tiktokImgService.insert(tiktokImg)); @@ -83,7 +83,7 @@ public class TiktokMiniController extends BaseController { @ApiOperation(value="修改TiktokImg") @PostMapping(value = "/updateTiktokImg") public AjaxResult updateTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgMiniDto dto){ - log.debug("抖音小程序端用户【{}】修改TiktokImg参数为:{}",dto.getUserId(), JSON.toJSONString(dto)); + log.info("抖音小程序端用户【{}】修改TiktokImg参数为:{}",dto.getUserId(), JSON.toJSONString(dto)); TiktokImg tiktokImg = dto.extractParam(); tiktokImg.setStatus("0"); return AjaxResult.success(tiktokImgService.update(dto.extractParam())); @@ -93,7 +93,7 @@ public class TiktokMiniController extends BaseController { @ApiOperation(value="删除TiktokImg") @GetMapping(value = "/deleteTiktokImg/{ids}") public AjaxResult deleteTiktokImg(@PathVariable @ApiParam("主键ids") List ids){ - log.debug("抖音小程序端删除TiktokImg参数为:{}", ids); + log.info("抖音小程序端删除TiktokImg参数为:{}", ids); return AjaxResult.success(tiktokImgService.delete(ids)); } @@ -129,7 +129,7 @@ public class TiktokMiniController extends BaseController { @ApiOperation(value="收藏") @PostMapping(value = "/tiktokCollect") public AjaxResult tiktokCollect(@Validated @RequestBody @ApiParam("收藏对象") CollectionDto dto){ - log.debug("收藏参数为:{}", JSON.toJSONString(dto)); + log.info("收藏参数为:{}", JSON.toJSONString(dto)); tiktokCollectionService.collect(dto.getUserId(),dto.getImgId()); return AjaxResult.success(); } @@ -138,7 +138,7 @@ public class TiktokMiniController extends BaseController { @ApiOperation(value="取消收藏") @PostMapping(value = "/tiktokUnCollect") public AjaxResult tiktokUnCollect(@Validated @RequestBody @ApiParam("收藏对象") CollectionDto dto){ - log.debug("取消收藏参数为:{}", JSON.toJSONString(dto)); + log.info("取消收藏参数为:{}", JSON.toJSONString(dto)); tiktokCollectionService.unCollect(dto.getUserId(),dto.getImgId()); return AjaxResult.success(); } @@ -147,7 +147,7 @@ public class TiktokMiniController extends BaseController { @ApiOperation(value="查询是否收藏过") @PostMapping(value = "/judgeTiktokCollect") public AjaxResult judgeTiktokCollect(@Validated @RequestBody @ApiParam("收藏对象") CollectionDto dto){ - log.debug("查询是否收藏过参数为:{}", JSON.toJSONString(dto)); + log.info("查询是否收藏过参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(tiktokCollectionService.judgeCollect(dto.getUserId(),dto.getImgId())); } @@ -155,7 +155,7 @@ public class TiktokMiniController extends BaseController { @ApiOperation(value="查看用户收藏列表") @PostMapping(value = "/listTiktokCollection") public AjaxResult listTiktokCollection(@Validated @RequestBody @ApiParam("用户收藏对象") CollectionUserDto dto){ - log.debug("查看用户收藏列表参数为:{}", JSON.toJSONString(dto)); + log.info("查看用户收藏列表参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(tiktokCollectionService.getCollectionByUserId(dto.getUserId())); } @@ -163,7 +163,7 @@ public class TiktokMiniController extends BaseController { @ApiOperation(value="点赞") @PostMapping(value = "/tiktokLike") public AjaxResult tiktokLike(@Validated @RequestBody @ApiParam("点赞对象") CollectionDto dto){ - log.debug("点赞参数为:{}", JSON.toJSONString(dto)); + log.info("点赞参数为:{}", JSON.toJSONString(dto)); tiktokLikeService.like(dto.getUserId(),dto.getImgId()); return AjaxResult.success(); } @@ -172,7 +172,7 @@ public class TiktokMiniController extends BaseController { @ApiOperation(value="取消点赞") @PostMapping(value = "/tiktokUnLike") public AjaxResult tiktokUnLike(@Validated @RequestBody @ApiParam("点赞对象") CollectionDto dto){ - log.debug("取消点赞参数为:{}", JSON.toJSONString(dto)); + log.info("取消点赞参数为:{}", JSON.toJSONString(dto)); tiktokLikeService.unLike(dto.getUserId(),dto.getImgId()); return AjaxResult.success(); } @@ -181,7 +181,7 @@ public class TiktokMiniController extends BaseController { @ApiOperation(value="查询是否点赞过") @PostMapping(value = "/judgeTiktokLike") public AjaxResult judgeTiktokLike(@Validated @RequestBody @ApiParam("点赞对象") CollectionDto dto){ - log.debug("查询是否点赞过参数为:{}", JSON.toJSONString(dto)); + log.info("查询是否点赞过参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(tiktokLikeService.judgeLike(dto.getUserId(),dto.getImgId())); } @@ -189,7 +189,7 @@ public class TiktokMiniController extends BaseController { @ApiOperation(value="用户登录") @PostMapping(value = "/loginTiktok") public AjaxResult loginTiktok(@Validated @RequestBody @ApiParam("登录对象") TiktokLoginDto dto){ - log.debug("用户登录参数为:{}", JSON.toJSONString(dto)); + log.info("用户登录参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(tiktokUserService.login(dto)); } @@ -197,8 +197,15 @@ public class TiktokMiniController extends BaseController { @ApiOperation(value="绑定手机号") @PostMapping(value = "/bindPhone") public AjaxResult bindPhone(@Validated @RequestBody @ApiParam("绑定对象") TiktokBindPhoneDto dto){ - log.debug("绑定手机号参数为:{}", JSON.toJSONString(dto)); + log.info("绑定手机号参数为:{}", JSON.toJSONString(dto)); tiktokUserService.bindPhone(dto); return AjaxResult.success(); } + + @ApiOperation(value="修改tiktok小程序用户信息") + @PostMapping(value = "/updateUser") + public AjaxResult updateUser(@Validated @RequestBody @ApiParam("user对象") TiktokUserMiniDto dto){ + log.info("修改tiktok小程序用户参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(tiktokUserService.miniUpdate(dto)); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java index 081c676..68a56f3 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java @@ -2,9 +2,11 @@ package com.bnyer.img.controller; import com.alibaba.fastjson.JSON; import com.bnyer.common.core.utils.Sm4Util; +import com.bnyer.common.core.utils.StringUtils; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.img.domain.TiktokUser; import com.bnyer.img.dto.StatusDto; import com.bnyer.img.dto.TiktokCreaterDto; @@ -38,8 +40,12 @@ public class TiktokUserController extends BaseController { List tiktokUsers = tiktokUserService.queryPage(dto); for (TiktokUser tiktokUser : tiktokUsers) { if(tiktokUser != null){ - tiktokUser.setPhone(Sm4Util.sm4Decrypt(tiktokUser.getPhone())); - tiktokUser.setTiktokCode(Sm4Util.sm4Decrypt(tiktokUser.getTiktokCode())); + if(StringUtils.isNotBlank(tiktokUser.getPhone())){ + tiktokUser.setPhone(Sm4Util.sm4Decrypt(tiktokUser.getPhone())); + } + if(StringUtils.isNotBlank(tiktokUser.getTiktokCode())){ + tiktokUser.setTiktokCode(Sm4Util.sm4Decrypt(tiktokUser.getTiktokCode())); + } } } return getDataTable(tiktokUsers); @@ -54,12 +60,12 @@ public class TiktokUserController extends BaseController { } //@RequiresPermissions("system:config:list") -// @ApiOperation(value="修改user") -// @PostMapping(value = "/update") -// public AjaxResult update(@Validated @RequestBody @ApiParam("user对象") TiktokUserDto dto){ -// log.debug("修改user参数为:{}", JSON.toJSONString(dto)); -// return AjaxResult.success(tiktokUserService.update(dto.extractParam())); -// } + @ApiOperation(value="修改艺术家") + @PostMapping(value = "/update") + public AjaxResult update(@RequestBody @ApiParam("艺术家对象") TiktokUserDto dto){ + log.debug("修改艺术家参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(tiktokUserService.update(dto.extractParam())); + } //@RequiresPermissions("system:config:list") @ApiOperation(value="删除user") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokUser.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokUser.java index 14a2b3f..fe260b4 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokUser.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokUser.java @@ -86,5 +86,12 @@ public class TiktokUser extends BaseDomain { @ApiModelProperty(value="是否活跃(0->不活跃;1->活跃 连续10天以上更新内容)") private String isHot; + /** + * 是否为艺术家(0->否;1->是) + */ + @TableField(value = "is_creator") + @ApiModelProperty(value="是否为艺术家(0->否;1->是)") + private String isCreator; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerPageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerPageDto.java index 8a19866..b58654d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerPageDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerPageDto.java @@ -18,4 +18,7 @@ public class BannerPageDto implements Serializable { @ApiModelProperty(value="平台渠道") private String source; + + @ApiModelProperty(value="是否显示") + private String isShow; } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokCreaterDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokCreaterDto.java index 7cd22c0..bef581d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokCreaterDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokCreaterDto.java @@ -17,6 +17,10 @@ import java.io.Serializable; @ApiModel("抖音艺术家接收类") public class TiktokCreaterDto implements Serializable { + @NotNull(message = "id不能为空") + @ApiModelProperty(value="id") + private Long id; + @NotNull(message = "抖音号不能为空") @ApiModelProperty(value="抖音号") private String tiktokNum; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserDto.java index 803e9ee..33bbaae 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserDto.java @@ -19,41 +19,36 @@ public class TiktokUserDto implements Serializable { @ApiModelProperty(value="id") private Long id; - @NotNull(message = "用户昵称不能为空!") @ApiModelProperty(value="用户昵称") private String username; - @NotNull(message = "抖音id不能为空!") @ApiModelProperty(value="抖音id") private String tiktokCode; - @NotNull(message = "抖音号不能为空!") @ApiModelProperty(value="抖音号") private String tiktokNumber; - @NotNull(message = "手机号不能为空!") @ApiModelProperty(value="手机号") private String phone; - @NotNull(message = "搜索码不能为空!") @ApiModelProperty(value="搜索码") private String scanCode; - @NotNull(message = "邀请码不能为空!") @ApiModelProperty(value="邀请码") private String inviteCode; @ApiModelProperty(value="个人简介") private String intro; - @NotNull(message = "头像地址不能为空!") @ApiModelProperty(value="头像img地址") private String img; - @NotNull(message = "是否活跃不能为空!") @ApiModelProperty(value="是否活跃(0->不活跃;1->活跃 连续10天以上更新内容)") private String isHot; + @ApiModelProperty(value="是否为艺术家(0->否;1->是)") + private String isCreator; + public TiktokUser extractParam(){ TiktokUser tiktokUser = new TiktokUser(); BeanUtils.copyProperties(this, tiktokUser); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserMiniDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserMiniDto.java new file mode 100644 index 0000000..e109657 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserMiniDto.java @@ -0,0 +1,38 @@ +package com.bnyer.img.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + + +@Getter +@Setter +@ApiModel("抖音小程序用户修改信息接收类") +public class TiktokUserMiniDto implements Serializable { + + @NotNull(message = "用户id不能为空！") + @ApiModelProperty(value="id") + private Long id; + + @ApiModelProperty(value="用户昵称") + private String username; + + @ApiModelProperty(value="抖音号") + private String tiktokNumber; + + @ApiModelProperty(value="手机号") + private String phone; + + @ApiModelProperty(value="搜索码") + private String scanCode; + + @ApiModelProperty(value="个人简介") + private String intro; + + @ApiModelProperty(value="头像img地址") + private String img; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserPageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserPageDto.java index 8f2aa61..4a119ed 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserPageDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserPageDto.java @@ -31,6 +31,9 @@ public class TiktokUserPageDto implements Serializable { @ApiModelProperty(value="是否活跃(0->不活跃;1->活跃 连续10天以上更新内容)") private String isHot; + @ApiModelProperty(value="是否为艺术家(0->否;1->是)") + private String isCreator; + @ApiModelProperty(value="是否展示") private String isShow; } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokUserMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokUserMapper.java index 49597ae..24a5118 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokUserMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokUserMapper.java @@ -2,8 +2,10 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.bnyer.img.domain.TiktokUser; +import com.bnyer.img.dto.TiktokUserPageDto; import com.bnyer.img.vo.TiktokUserVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,4 +17,11 @@ public interface TiktokUserMapper extends BaseMapper { * @return - */ List queryThreeImgUserList(); + + /** + * 查询用户分页 + * @param params 分页参数 + * @return - + */ + List queryPage(@Param("params") TiktokUserPageDto params); } \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java index 56180c8..9e099d2 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java @@ -1,12 +1,7 @@ package com.bnyer.img.service; import com.bnyer.img.domain.TiktokUser; -import com.bnyer.img.dto.TiktokBindPhoneDto; -import com.bnyer.img.dto.TiktokCreaterDto; -import com.bnyer.img.dto.TiktokLoginDto; -import com.bnyer.img.dto.TiktokUserPageDto; -import com.bnyer.img.vo.TiktokSessionInfoVo; -import com.bnyer.img.vo.TiktokUserPhoneInfoVo; +import com.bnyer.img.dto.*; import com.bnyer.img.vo.TiktokUserVo; import java.util.List; @@ -26,7 +21,7 @@ public interface TiktokUserService { * @param tiktokUser 抖音用户 * @return - */ - //int update(TiktokUser tiktokUser); + int update(TiktokUser tiktokUser); /** * 批量删除抖音用户 @@ -76,4 +71,11 @@ public interface TiktokUserService { * @return - */ int changeStatus(Long id,String status); + + /** + * 抖音小程序用户修改个人信息 + * @param dto 信息参数 + * @return - + */ + int miniUpdate(TiktokUserMiniDto dto); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BannerServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BannerServiceImpl.java index c9e5161..58d0f06 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BannerServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BannerServiceImpl.java @@ -44,8 +44,9 @@ public class BannerServiceImpl implements BannerService { @Override public List queryPage(BannerPageDto dto) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.like(StringUtils.isNotNull(dto.getBannerName()), Banner::getBannerName,dto.getBannerName()); - wrapper.eq(StringUtils.isNotNull(dto.getSource()), Banner::getSource, dto.getSource()); + wrapper.like(StringUtils.isNotBlank(dto.getBannerName()), Banner::getBannerName,dto.getBannerName()); + wrapper.eq(StringUtils.isNotBlank(dto.getSource()), Banner::getSource, dto.getSource()); + wrapper.eq(StringUtils.isNotBlank(dto.getIsShow()), Banner::getIsShow, dto.getIsShow()); wrapper.orderByDesc(Banner::getSort); return bannerMapper.selectList(wrapper); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java index 4abb237..ef4f78c 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java @@ -13,10 +13,7 @@ import com.bnyer.img.constants.RedisKeyConstant; import com.bnyer.img.constants.TiktokConstant; import com.bnyer.img.domain.TiktokImg; import com.bnyer.img.domain.TiktokUser; -import com.bnyer.img.dto.TiktokBindPhoneDto; -import com.bnyer.img.dto.TiktokCreaterDto; -import com.bnyer.img.dto.TiktokLoginDto; -import com.bnyer.img.dto.TiktokUserPageDto; +import com.bnyer.img.dto.*; import com.bnyer.img.mapper.TiktokImgMapper; import com.bnyer.img.mapper.TiktokUserMapper; import com.bnyer.img.service.TiktokUserService; @@ -25,6 +22,7 @@ import com.bnyer.img.vo.TiktokUserInfoVo; import com.bnyer.img.vo.TiktokUserPhoneInfoVo; import com.bnyer.img.vo.TiktokUserVo; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; @@ -92,8 +90,8 @@ public class TiktokUserServiceImpl implements TiktokUserService { public int insertCreator(TiktokCreaterDto dto) { //检查手机号是否存在 boolean b1 = checkPhone(Sm4Util.sm4Encryption(dto.getPhone())); - if(!b1){ - throw new ServiceException("用户尚未绑定手机号,请手动绑定!",TiktokConstant.UN_BIND_PHONE); + if(b1){ + throw new ServiceException("当前手机号已绑定用户,请重新编辑!",TiktokConstant.BINDED_PHONE); } //检查搜索码是否重复 boolean b = this.checkScanCode(dto.getScanCode()); @@ -101,21 +99,26 @@ public class TiktokUserServiceImpl implements TiktokUserService { throw new ServiceException("搜索码重复,请重新编辑！",TiktokConstant.SCAN_CODE_REPEAT); } TiktokUser user = new TiktokUser(); + user.setId(dto.getId()); user.setIntro(dto.getIntro()); user.setScanCode(dto.getScanCode()); user.setInviteCode(dto.getInviteCode()); user.setTiktokNumber(dto.getTiktokNum()); - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(TiktokUser::getPhone, Sm4Util.sm4Encryption(dto.getPhone())); - int update = tiktokUserMapper.update(user, updateWrapper); - log.info("用户【{}】成为艺术家成功!",dto.getPhone()); + user.setPhone(Sm4Util.sm4Encryption(dto.getPhone())); + user.setIsCreator("1"); + int update = tiktokUserMapper.updateById(user); + log.info("用户id【{}】手机号【{}】成为艺术家成功!",dto.getId(),dto.getPhone()); return update; } -// @Override -// public int update(TiktokUser tiktokUser) { -// return 0; -// } + @Override + public int update(TiktokUser tiktokUser) { + tiktokUser.setUpdateTime(new Date()); + if(StringUtils.isNotBlank(tiktokUser.getPhone())){ + tiktokUser.setPhone(Sm4Util.sm4Encryption(tiktokUser.getPhone())); + } + return tiktokUserMapper.updateById(tiktokUser); + } @Override public int delete(List ids) { @@ -131,17 +134,10 @@ public class TiktokUserServiceImpl implements TiktokUserService { @Override public List queryPage(TiktokUserPageDto dto) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.like(StringUtils.isNotNull(dto.getUsername()), TiktokUser::getUsername, dto.getUsername()); if(StringUtils.isNotNull(dto.getPhone())){ - wrapper.eq(TiktokUser::getPhone, Sm4Util.sm4Encryption(dto.getPhone())); + dto.setPhone(Sm4Util.sm4Encryption(dto.getPhone())); } - wrapper.eq(StringUtils.isNotNull(dto.getTiktokNumber()), TiktokUser::getTiktokNumber, dto.getTiktokNumber()); - wrapper.eq(StringUtils.isNotNull(dto.getScanCode()), TiktokUser::getScanCode, dto.getScanCode()); - wrapper.eq(StringUtils.isNotNull(dto.getInviteCode()), TiktokUser::getInviteCode, dto.getInviteCode()); - wrapper.eq(StringUtils.isNotNull(dto.getIsHot()), TiktokUser::getIsHot, dto.getIsHot()); - wrapper.eq(StringUtils.isNotNull(dto.getIsShow()), TiktokUser::getIsShow, dto.getIsShow()); - return tiktokUserMapper.selectList(wrapper); + return tiktokUserMapper.queryPage(dto); } @Override @@ -294,6 +290,17 @@ public class TiktokUserServiceImpl implements TiktokUserService { return tiktokUserMapper.update(user,wrapper); } + @Override + public int miniUpdate(TiktokUserMiniDto dto) { + if(StringUtils.isNotBlank(dto.getPhone())){ + dto.setPhone(Sm4Util.sm4Encryption(dto.getPhone())); + } + TiktokUser user = new TiktokUser(); + BeanUtils.copyProperties(dto,user); + user.setUpdateTime(new Date()); + return tiktokUserMapper.updateById(user); + } + /** * 获取用户手机号 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokUserVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokUserVo.java index 9ad9ec3..20df7fa 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokUserVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TiktokUserVo.java @@ -32,6 +32,9 @@ public class TiktokUserVo implements Serializable { @ApiModelProperty(value="是否活跃(0->不活跃;1->活跃 连续10天以上更新内容)") private String isHot; + @ApiModelProperty(value="是否为艺术家(0->否;1->是)") + private String isCreator; + @ApiModelProperty(value="序号") private Integer sort; diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokUserMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokUserMapper.xml index d7de59d..54d42f6 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokUserMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokUserMapper.xml @@ -15,6 +15,7 @@ + @@ -35,7 +36,7 @@ id, username, tiktok_code, tiktok_number, phone, scan_code, invite_code, intro, img, - is_hot, is_show, create_time, update_time, sort + is_hot,is_creator, is_show, create_time, update_time, sort + \ No newline at end of file