From d362e9c756713ffeaba2d3d7257da19ef12fa516 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 20 Apr 2021 14:54:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=EF=BC=88=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=89=E7=AD=BE=E5=88=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/act/form/SetSignTimeFormDTO.java | 39 ++++++++++ .../dto/act/result/SetSignTimeResultDTO.java | 22 ++++++ .../controller/ActSignInRecordController.java | 23 ++++++ .../modules/act/dao/ActSignInCodeDao.java | 9 ++- .../act/service/ActSignInCodeService.java | 8 ++ .../act/service/ActSignInRecordService.java | 10 +++ .../impl/ActSignInCodeServiceImpl.java | 11 +++ .../impl/ActSignInRecordServiceImpl.java | 75 ++++++++++++++++++- .../service/impl/GroupActInfoServiceImpl.java | 5 +- .../resources/mapper/act/ActSignInCodeDao.xml | 9 ++- 10 files changed, 206 insertions(+), 5 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/SetSignTimeFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/SetSignTimeResultDTO.java diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/SetSignTimeFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/SetSignTimeFormDTO.java new file mode 100644 index 0000000000..d4a04f82f1 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/SetSignTimeFormDTO.java @@ -0,0 +1,39 @@ +package com.epmet.resi.group.dto.act.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 010、设置（修改）签到时间,生成签到码 + * + * @author yinzuomei@elink-cn.com + * @date 2021/4/20 13:34 + */ +@Data +public class SetSignTimeFormDTO implements Serializable { + private static final long serialVersionUID = 4134192208518833623L; + public interface AddUserInternalGroup { + } + /** + * 小组活动id + */ + @NotBlank(message = "groupActId不能为空",groups = AddUserInternalGroup.class) + private String groupActId; + + /** + * 签到开始时间：yyyy-MM-dd HH:mm + */ + @NotBlank(message = "开始时间不能为空",groups = AddUserInternalGroup.class) + private String signInStartTime; + + /** + * 签到截止时间：yyyy-MM-dd HH:mm + */ + @NotBlank(message = "截止时间不能为空",groups = AddUserInternalGroup.class) + private String signInEndTime; + + @NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class) + private String userId; +} 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 new file mode 100644 index 0000000000..08e190e3da --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/SetSignTimeResultDTO.java @@ -0,0 +1,22 @@ +package com.epmet.resi.group.dto.act.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 010、设置（修改）签到时间,生成签到码 + * + * @author yinzuomei@elink-cn.com + * @date 2021/4/20 13:46 + */ +@Data +public class SetSignTimeResultDTO implements Serializable { + private static final long serialVersionUID = -7444245554430563944L; + + 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 f315d843b5..7bece885f4 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 @@ -17,8 +17,16 @@ package com.epmet.modules.act.controller; +import com.epmet.commons.tools.annotation.LoginUser; +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.result.SetSignTimeResultDTO; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -36,4 +44,19 @@ public class ActSignInRecordController { @Autowired private ActSignInRecordService actSignInRecordService; + + /** + * @param tokenDto + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @description 010、设置（修改）签到时间,生成签到码 + * @Date 2021/4/20 13:50 + **/ + @PostMapping("setsigntime") + public Result setSignTime(@LoginUser TokenDto tokenDto, @RequestBody SetSignTimeFormDTO formDTO) { + formDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO, SetSignTimeFormDTO.AddUserInternalGroup.class); + return new Result().ok(actSignInRecordService.setSignTime(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInCodeDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInCodeDao.java index cc918ba292..3c50862d57 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInCodeDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInCodeDao.java @@ -19,6 +19,7 @@ package com.epmet.modules.act.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.act.entity.ActSignInCodeEntity; +import com.epmet.resi.group.dto.act.ActSignInCodeDTO; import org.apache.ibatis.annotations.Mapper; /** @@ -29,5 +30,11 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ActSignInCodeDao extends BaseDao { - + /** + * 获取最后一次生成的签到码 + * + * @param groupActId + * @return com.epmet.resi.group.dto.act.ActSignInCodeDTO + */ + ActSignInCodeDTO selectLastRec(String groupActId); } \ 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 a5d713dcb2..78bff472cd 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 @@ -19,6 +19,7 @@ package com.epmet.modules.act.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.modules.act.entity.ActSignInCodeEntity; +import com.epmet.resi.group.dto.act.ActSignInCodeDTO; /** * 组织活动签到码 @@ -28,4 +29,11 @@ import com.epmet.modules.act.entity.ActSignInCodeEntity; */ public interface ActSignInCodeService extends BaseService { + /** + * 获取最后一次生成的签到码 + * + * @param groupActId + * @return com.epmet.resi.group.dto.act.ActSignInCodeDTO + */ + ActSignInCodeDTO selectLastRec(String groupActId); } \ 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 b3ea3f44fe..eb62f8d39a 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,6 +19,8 @@ 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.result.SetSignTimeResultDTO; /** * 组织活动签到记录 @@ -36,4 +38,12 @@ public interface ActSignInRecordService extends BaseService implements ActSignInCodeService { + /** + * 获取最后一次生成的签到码 + * + * @param groupActId + * @return com.epmet.resi.group.dto.act.ActSignInCodeDTO + */ + @Override + public ActSignInCodeDTO selectLastRec(String groupActId) { + return baseDao.selectLastRec(groupActId); + } } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java index 393f355f1c..eb44cd3fbc 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java @@ -18,10 +18,27 @@ package com.epmet.modules.act.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.modules.act.dao.ActSignInRecordDao; +import com.epmet.modules.act.dao.GroupActInfoDao; import com.epmet.modules.act.entity.ActSignInRecordEntity; +import com.epmet.modules.act.entity.GroupActInfoEntity; +import com.epmet.modules.act.service.ActSignInCodeService; import com.epmet.modules.act.service.ActSignInRecordService; +import com.epmet.modules.act.service.GroupActInfoService; +import com.epmet.modules.member.service.ResiGroupMemberService; +import com.epmet.resi.group.dto.act.ActSignInCodeDTO; +import com.epmet.resi.group.dto.act.GroupActInfoDTO; +import com.epmet.resi.group.dto.act.form.SetSignTimeFormDTO; +import com.epmet.resi.group.dto.act.result.SetSignTimeResultDTO; +import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * 组织活动签到记录 @@ -29,9 +46,17 @@ import org.springframework.stereotype.Service; * @author generator generator@elink-cn.com * @since v1.0.0 2021-04-16 */ +@Slf4j @Service public class ActSignInRecordServiceImpl extends BaseServiceImpl implements ActSignInRecordService { - + @Autowired + private GroupActInfoService groupActInfoService; + @Autowired + private ResiGroupMemberService resiGroupMemberService; + @Autowired + private GroupActInfoDao groupActInfoDao; + @Autowired + private ActSignInCodeService actSignInCodeService; /** * 查询当前用户是否签到 * @@ -46,4 +71,52 @@ public class ActSignInRecordServiceImpl extends BaseServiceImpl - + \ No newline at end of file