From bd96bb0aa54bacd218c59e408cdb1ee6431c0acc Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Fri, 14 Apr 2023 15:53:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=AB=98=E8=B4=A8=E9=87=8F=E8=BF=90?= =?UTF-8?q?=E8=90=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../highquality/service/impl/HighQualityStyleServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityStyleServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityStyleServiceImpl.java index 4061068..a5dc0db 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityStyleServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityStyleServiceImpl.java @@ -73,11 +73,12 @@ public class HighQualityStyleServiceImpl extends ServiceImpl Date: Fri, 21 Apr 2023 16:26:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=AB=98=E8=B4=A8=E9=87=8F=E8=BF=90?= =?UTF-8?q?=E8=90=A5=EF=BC=9Aoss=E4=B8=8A=E4=BC=A0=E3=80=81=E7=82=B9?= =?UTF-8?q?=E8=B5=9E=E3=80=81=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HighQualityClientController.java | 30 +++++++- .../HighQualityMaintainController.java | 11 ++- .../dao/HighQualityCommentMapper.java | 13 ++++ .../dao/HighQualityLikesMapper.java | 13 ++++ .../dao/mapper/HighQualityCommentMapper.xml | 23 ++++++ .../dao/mapper/HighQualityLikesMapper.xml | 20 ++++++ .../entity/HighQualityComment.java | 70 +++++++++++++++++++ .../highquality/entity/HighQualityLikes.java | 57 +++++++++++++++ .../service/HighQualityCommentService.java | 17 +++++ .../service/HighQualityLikesService.java | 17 +++++ .../impl/HighQualityCommentServiceImpl.java | 44 ++++++++++++ .../impl/HighQualityLikesServiceImpl.java | 50 +++++++++++++ .../impl/HighQualityStyleServiceImpl.java | 10 --- .../uploadOss/service/IUploadOssService.java | 3 + .../service/impl/UploadOssServiceImpl.java | 60 +++++++++++++++- 15 files changed, 424 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/HighQualityCommentMapper.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/HighQualityLikesMapper.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityCommentMapper.xml create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityLikesMapper.xml create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/entity/HighQualityComment.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/entity/HighQualityLikes.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/HighQualityCommentService.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/HighQualityLikesService.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityCommentServiceImpl.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityLikesServiceImpl.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityClientController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityClientController.java index 7130f7c..23bec1b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityClientController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityClientController.java @@ -5,13 +5,16 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.extend.highquality.entity.*; import com.chinaunicom.mall.ebtp.extend.highquality.service.*; import com.chinaunicom.mall.ebtp.extend.highquality.vo.HighQualityQueryInVO; -import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.MockDataValue; +import com.chinaunicom.mall.ebtp.extend.signature.entity.ExpertSignature; +import com.chinaunicom.mall.ebtp.extend.uploadOss.service.IUploadOssService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; import java.util.Map; @@ -26,6 +29,12 @@ public class HighQualityClientController { private HighQualityStyleService highQualityStyleService; @Resource private HighQualityContactService highQualityContactService; + @Resource + private HighQualityLikesService highQualityLikesService; + @Resource + private HighQualityCommentService highQualityCommentService; + @Resource + private IUploadOssService iUploadOssService; @ApiOperation("右侧专业线数据") @@ -71,5 +80,22 @@ public class HighQualityClientController { public BaseResponse saveContact(@RequestBody HighQualityContact inVO) { return BaseResponse.success(highQualityContactService.saveContact(inVO)); } + @ApiOperation("点赞") + @PostMapping("/saveLikes") + public BaseResponse saveLikes(@RequestBody HighQualityLikes inVO) { + return highQualityLikesService.saveLikes(inVO); + } + + @ApiOperation("评论") + @PostMapping("/saveComment") + public BaseResponse saveComment(@RequestBody HighQualityComment inVO) { + return highQualityCommentService.saveComment(inVO); + } + + @ApiOperation("oss文件下载") + @PostMapping("/download") + public void download(@RequestParam String key, HttpServletResponse response) throws IOException { + iUploadOssService.download(response,key); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityMaintainController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityMaintainController.java index ccb1b8d..1d41204 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityMaintainController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityMaintainController.java @@ -10,12 +10,15 @@ import com.chinaunicom.mall.ebtp.extend.highquality.service.*; import com.chinaunicom.mall.ebtp.extend.highquality.vo.HighQualityMaintainInVO; import com.chinaunicom.mall.ebtp.extend.highquality.vo.HighQualityMaintainOutVO; import com.chinaunicom.mall.ebtp.extend.highquality.vo.HighQualityRightDataVO; +import com.chinaunicom.mall.ebtp.extend.uploadOss.service.IUploadOssService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -34,7 +37,8 @@ public class HighQualityMaintainController { private HighQualityStyleService highQualityStyleService; @Resource private HighQualityContactService highQualityContactService; - + @Resource + private IUploadOssService iUploadOssService; @ApiOperation("保存联系人") @PostMapping("/save/contact") @@ -94,6 +98,11 @@ public class HighQualityMaintainController { return BaseResponse.success(highQualityStyleService.deleteStyleOrProject(id)); } + @ApiOperation("oss文件上传") + @PostMapping("/upload") + public BaseResponse upload(@RequestParam("file") MultipartFile file) throws IOException { + return BaseResponse.success(iUploadOssService.uploadFile(file,"oss/highquality")); + } public void exportGetlist(HttpServletResponse response, ExcelTable table) { diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/HighQualityCommentMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/HighQualityCommentMapper.java new file mode 100644 index 0000000..4c367e6 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/HighQualityCommentMapper.java @@ -0,0 +1,13 @@ +package com.chinaunicom.mall.ebtp.extend.highquality.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.chinaunicom.mall.ebtp.extend.highquality.entity.HighQualityComment; + +/** +* @auto.generated +*/ +public interface HighQualityCommentMapper extends BaseMapper { + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/HighQualityLikesMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/HighQualityLikesMapper.java new file mode 100644 index 0000000..57f597d --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/HighQualityLikesMapper.java @@ -0,0 +1,13 @@ +package com.chinaunicom.mall.ebtp.extend.highquality.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.chinaunicom.mall.ebtp.extend.highquality.entity.HighQualityLikes; + +/** +* @auto.generated +*/ +public interface HighQualityLikesMapper extends BaseMapper { + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityCommentMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityCommentMapper.xml new file mode 100644 index 0000000..6ba1b0b --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityCommentMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + update high_quality_comment + set + delete_flag="deleted" + where ID=#{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityLikesMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityLikesMapper.xml new file mode 100644 index 0000000..657a29a --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityLikesMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + update high_quality_likes + set + delete_flag="deleted" + where ID=#{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/entity/HighQualityComment.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/entity/HighQualityComment.java new file mode 100644 index 0000000..8c82f51 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/entity/HighQualityComment.java @@ -0,0 +1,70 @@ +package com.chinaunicom.mall.ebtp.extend.highquality.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; + +/** + * 实体类 HighQualityComment + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@ApiModel +@EqualsAndHashCode(callSuper = false) +@TableName(value = "high_quality_comment", autoResultMap = true) +public class HighQualityComment implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty(value = "") + private String id; + + /** + * 关联表的主键id + */ + @ApiModelProperty(value = "关联表的主键id") + private String reId; + + /** + * 评论内容 + */ + @ApiModelProperty(value = "评论内容") + private String context; + + /** + * 评论人id + */ + @ApiModelProperty(value = "评论人id") + private String createrId; + + /** + * 评论人姓名 + */ + @ApiModelProperty(value = "评论人姓名") + private String createrName; + + /** + * 评论时间 + */ + @ApiModelProperty(value = "评论时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private java.time.LocalDateTime createTime; + + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/entity/HighQualityLikes.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/entity/HighQualityLikes.java new file mode 100644 index 0000000..27f8dc5 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/entity/HighQualityLikes.java @@ -0,0 +1,57 @@ +package com.chinaunicom.mall.ebtp.extend.highquality.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; + +/** + * 实体类 HighQualityLikes + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@ApiModel +@EqualsAndHashCode(callSuper = false) +@TableName(value = "high_quality_likes", autoResultMap = true) +public class HighQualityLikes implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键") + private String id; + + /** + * 关联表的主键id + */ + @ApiModelProperty(value = "关联表的主键id") + private String reId; + + /** + * 点赞账户 + */ + @ApiModelProperty(value = "点赞账户") + private String account; + + /** + * 点赞时间 + */ + @ApiModelProperty(value = "点赞时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private java.time.LocalDateTime createTime; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/HighQualityCommentService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/HighQualityCommentService.java new file mode 100644 index 0000000..6231785 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/HighQualityCommentService.java @@ -0,0 +1,17 @@ +package com.chinaunicom.mall.ebtp.extend.highquality.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.highquality.entity.HighQualityComment; + +/** + * 对数据表 high_quality_comment 操作的 service + * @author Auto create + * + */ +public interface HighQualityCommentService extends IService{ + + + BaseResponse saveComment(HighQualityComment inVo); +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/HighQualityLikesService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/HighQualityLikesService.java new file mode 100644 index 0000000..de78de0 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/HighQualityLikesService.java @@ -0,0 +1,17 @@ +package com.chinaunicom.mall.ebtp.extend.highquality.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.highquality.entity.HighQualityLikes; + +/** + * 对数据表 high_quality_likes 操作的 service + * @author Auto create + * + */ +public interface HighQualityLikesService extends IService{ + + + BaseResponse saveLikes(HighQualityLikes inVo); +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityCommentServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityCommentServiceImpl.java new file mode 100644 index 0000000..125380a --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityCommentServiceImpl.java @@ -0,0 +1,44 @@ +package com.chinaunicom.mall.ebtp.extend.highquality.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; +import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; +import com.chinaunicom.mall.ebtp.extend.highquality.dao.HighQualityCommentMapper; +import com.chinaunicom.mall.ebtp.extend.highquality.entity.HighQualityComment; +import com.chinaunicom.mall.ebtp.extend.highquality.entity.HighQualityLikes; +import com.chinaunicom.mall.ebtp.extend.highquality.service.HighQualityCommentService; +import org.apache.commons.lang.StringUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.time.LocalDateTime; + +/** + * 对数据表 high_quality_comment 操作的 serviceImpl + * @auto.generated + * + */ +@Service +public class HighQualityCommentServiceImpl extends ServiceImpl implements HighQualityCommentService { + + @Resource + private IBaseCacheUserService iBaseCacheUserService; + + @Override + public BaseResponse saveComment(HighQualityComment inVo){ + BaseCacheUser cacheUser = iBaseCacheUserService.getCacheUser(); + if(StringUtils.isBlank(inVo.getReId()) || StringUtils.isBlank(inVo.getContext())){ + return BaseResponse.fail("评论失败:评论内容或评论对象不能为空"); + } + inVo.setId(PropertyUtils.getSnowflakeId()); + inVo.setCreaterId(cacheUser.getUserId()); + inVo.setCreaterName(cacheUser.getFullName()); + inVo.setCreateTime(LocalDateTime.now()); + if(this.save(inVo)){ + return BaseResponse.success("评论成功"); + } + return BaseResponse.fail("评论失败"); + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityLikesServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityLikesServiceImpl.java new file mode 100644 index 0000000..6db436d --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityLikesServiceImpl.java @@ -0,0 +1,50 @@ +package com.chinaunicom.mall.ebtp.extend.highquality.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.ParameterUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; +import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; +import com.chinaunicom.mall.ebtp.extend.highquality.dao.HighQualityLikesMapper; +import com.chinaunicom.mall.ebtp.extend.highquality.entity.HighQualityLikes; +import com.chinaunicom.mall.ebtp.extend.highquality.service.HighQualityLikesService; +import org.apache.poi.ss.formula.functions.T; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 对数据表 high_quality_likes 操作的 serviceImpl + * @auto.generated + * + */ +@Service +public class HighQualityLikesServiceImpl extends ServiceImpl implements HighQualityLikesService { + + @Resource + private IBaseCacheUserService iBaseCacheUserService; + + @Override + public BaseResponse saveLikes(HighQualityLikes inVo){ + BaseCacheUser cacheUser = iBaseCacheUserService.getCacheUser(); + LambdaQueryWrapper query= Wrappers.lambdaQuery(); + query.eq(HighQualityLikes::getReId,inVo.getReId()); + query.eq(HighQualityLikes::getAccount,cacheUser.getUserId()); + List list=this.list(query); + if(list!=null && list.size()>0){ + return BaseResponse.fail("您已点赞"); + } + inVo.setId(PropertyUtils.getSnowflakeId()); + inVo.setAccount(cacheUser.getUserId()); + inVo.setCreateTime(LocalDateTime.now()); + if(this.save(inVo)){ + return BaseResponse.success("点赞成功"); + } + return BaseResponse.fail("点赞失败"); + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityStyleServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityStyleServiceImpl.java index a5dc0db..7701dc0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityStyleServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityStyleServiceImpl.java @@ -73,15 +73,6 @@ public class HighQualityStyleServiceImpl extends ServiceImpl