From 59ec40e6cdb321cf22516b88dbd2c8f08b9c305c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 21 Apr 2021 18:15:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=AD=BE=E5=88=B0=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/act/form/BuildSignInCodeFormDTO.java | 31 ++++++ .../act/form/BuildSignInCodeResultDTO.java | 14 +++ .../dto/act/result/SetSignTimeResultDTO.java | 1 - .../controller/ActSignInRecordController.java | 19 +++- .../act/service/ActSignInCodeService.java | 3 + .../act/service/ActSignInRecordService.java | 12 ++- .../impl/ActSignInCodeServiceImpl.java | 5 + .../impl/ActSignInRecordServiceImpl.java | 98 +++++++++++++++---- .../epmet/modules/utils/ModuleConstant.java | 5 + 9 files changed, 160 insertions(+), 28 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/BuildSignInCodeFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/BuildSignInCodeResultDTO.java diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/BuildSignInCodeFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/BuildSignInCodeFormDTO.java new file mode 100644 index 0000000000..655005efec --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/BuildSignInCodeFormDTO.java @@ -0,0 +1,31 @@ +package com.epmet.resi.group.dto.act.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 018、获取签到码图片 + * + * @author yinzuomei@elink-cn.com + * @date 2021/4/21 18:01 + */ +@Data +public class BuildSignInCodeFormDTO implements Serializable { + private static final long serialVersionUID = -2806512125925383053L; + + public interface AddUserInternalGroup { + } + + @NotBlank(message = "groupActId不能为空", groups = AddUserInternalGroup.class) + private String groupActId; + + /** + * 当前用户id + */ + @NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class) + private String userId; + + private String customerId; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/BuildSignInCodeResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/BuildSignInCodeResultDTO.java new file mode 100644 index 0000000000..77b474470e --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/BuildSignInCodeResultDTO.java @@ -0,0 +1,14 @@ +package com.epmet.resi.group.dto.act.form; + +import lombok.Data; + +/** + * 018、获取签到码图片 + * + * @author yinzuomei@elink-cn.com + * @date 2021/4/21 18:13 + */ +@Data +public class BuildSignInCodeResultDTO { + private String signInCodeUrl; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/SetSignTimeResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/SetSignTimeResultDTO.java index 08e190e3da..028377add9 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/SetSignTimeResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/SetSignTimeResultDTO.java @@ -18,5 +18,4 @@ public class SetSignTimeResultDTO implements Serializable { private String groupActId; private Date signInStartTime; private Date signInEndTime; - private String signInCodeUrl; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSignInRecordController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSignInRecordController.java index 3e8883dbd6..cb2ed021e4 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSignInRecordController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSignInRecordController.java @@ -22,9 +22,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.modules.act.service.ActSignInRecordService; -import com.epmet.resi.group.dto.act.form.SetSignTimeFormDTO; -import com.epmet.resi.group.dto.act.form.SignInFormDTO; -import com.epmet.resi.group.dto.act.form.SignInRecFormDTO; +import com.epmet.resi.group.dto.act.form.*; import com.epmet.resi.group.dto.act.result.SetSignTimeResultDTO; import com.epmet.resi.group.dto.act.result.SignInRecResultDTO; import org.springframework.beans.factory.annotation.Autowired; @@ -92,4 +90,19 @@ public class ActSignInRecordController { ValidatorUtils.validateEntity(formDTO,SignInRecFormDTO.AddUserInternalGroup.class); return new Result().ok(actSignInRecordService.querySignRecList(formDTO)); } + + /** + * @param tokenDto + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @description 018、获取签到码图片 + * @Date 2021/4/21 18:05 + **/ + @PostMapping("geturl") + public Result getSignInUrl(@LoginUser TokenDto tokenDto, @RequestBody BuildSignInCodeFormDTO formDTO) { + formDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO, BuildSignInCodeFormDTO.AddUserInternalGroup.class); + return new Result().ok(actSignInRecordService.getSignInUrl(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSignInCodeService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSignInCodeService.java index 78bff472cd..469aad289d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSignInCodeService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSignInCodeService.java @@ -36,4 +36,7 @@ public interface ActSignInCodeService extends BaseService { * @return com.epmet.resi.group.dto.act.ActSignInCodeDTO */ ActSignInCodeDTO selectLastRec(String groupActId); + + + int saveActSignInCodeEntity(ActSignInCodeEntity actSignInCodeEntity); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSignInRecordService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSignInRecordService.java index da979840b0..26d1d08743 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSignInRecordService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSignInRecordService.java @@ -19,9 +19,7 @@ package com.epmet.modules.act.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.modules.act.entity.ActSignInRecordEntity; -import com.epmet.resi.group.dto.act.form.SetSignTimeFormDTO; -import com.epmet.resi.group.dto.act.form.SignInFormDTO; -import com.epmet.resi.group.dto.act.form.SignInRecFormDTO; +import com.epmet.resi.group.dto.act.form.*; import com.epmet.resi.group.dto.act.result.SetSignTimeResultDTO; import com.epmet.resi.group.dto.act.result.SignInRecResultDTO; @@ -65,4 +63,12 @@ public interface ActSignInRecordService extends BaseService uploadResult = ossFeignClient.uploadQrCode(qrCodeMultipartFile); + if (!uploadResult.success()) { + throw new RenException("调用oss服务上传活动签到码失败"); + } + //别忘了插入数据库act_sign_in_code + ActSignInCodeEntity actSignInCodeEntity = new ActSignInCodeEntity(); + actSignInCodeEntity.setCustomerId(formDTO.getCustomerId()); + actSignInCodeEntity.setGroupActId(formDTO.getGroupActId()); + actSignInCodeEntity.setUrl(uploadResult.getData().getUrl()); + actSignInCodeService.saveActSignInCodeEntity(actSignInCodeEntity); + resultDTO.setSignInCodeUrl(uploadResult.getData().getUrl()); + } + return resultDTO; + } } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java index 15334f14e9..fa0f11c3c1 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java @@ -369,6 +369,11 @@ public interface ModuleConstant extends Constant { */ String CODE_INVITE_PAGE = "pages/group/group/invitation/invitation"; + /** + * 活动扫码签到，对应的跳转到 活动详情页面 + */ + String GROUP_ACT_DETAIL_PAGE = "XXXXXXXXXXXXXXXXXXXXX找莹姐要路径"; + String TOPIC_CONTENT_AND_VOICE_IS_NULL = "请输入话题内容或语音"; /**