From e93be1df7c747e4c78506bb2f3aa73ceff0ebd72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=8F=E5=A4=A9=E3=80=82=E3=80=82?= <1107578936@qq.com> Date: Fri, 17 Jun 2022 21:54:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=BA=86=E9=83=A8=E5=88=86bug,?= =?UTF-8?q?=E4=B8=94=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ums/controller/UmsCheckController.java | 10 +-- .../modules/ums/service/UmsCheckService.java | 2 + .../ums/service/impl/UmsCheckServiceImpl.java | 6 ++ .../com/mobius/modules/ums/vo/RewardVo.java | 8 +- mobius-portal/pom.xml | 6 ++ .../mobius/modules/lms/dto/PenBriefDTO.java | 3 + .../mobius/modules/lms/dto/PenInfoDTO.java | 3 + .../modules/lms/mapper/LmsPenMapper.java | 6 +- .../ums/controller/UmsCheckController.java | 2 +- .../UmsUserCheckRecordController.java | 20 +++++ .../ums/mapper/UmsUserCheckRecordMapper.java | 16 ++++ .../modules/ums/model/UmsUserCheckRecord.java | 50 +++++++++++ .../ums/model/UmsUserStampRelation.java | 6 +- .../modules/ums/service/UmsCheckService.java | 2 + .../service/UmsUserCheckRecordService.java | 18 ++++ .../ums/service/impl/UmsCheckServiceImpl.java | 49 +++++++++-- .../impl/UmsUserCheckRecordServiceImpl.java | 34 +++++++ .../src/main/resources/application.yml | 2 + .../modules/lms/mapper/LmsPenMapperTest.java | 62 ++++++------- .../impl/LmsVerifyLetterServiceImplTest.java | 48 +++++----- .../modules/ums/mapper/UmsUserMapperTest.java | 56 ++++++------ .../service/impl/UserInfoServiceImplTest.java | 88 +++++++++---------- 22 files changed, 347 insertions(+), 150 deletions(-) create mode 100644 mobius-portal/src/main/java/com/mobius/modules/ums/controller/UmsUserCheckRecordController.java create mode 100644 mobius-portal/src/main/java/com/mobius/modules/ums/mapper/UmsUserCheckRecordMapper.java create mode 100644 mobius-portal/src/main/java/com/mobius/modules/ums/model/UmsUserCheckRecord.java create mode 100644 mobius-portal/src/main/java/com/mobius/modules/ums/service/UmsUserCheckRecordService.java create mode 100644 mobius-portal/src/main/java/com/mobius/modules/ums/service/impl/UmsUserCheckRecordServiceImpl.java diff --git a/mobius-admin/src/main/java/com/mobius/modules/ums/controller/UmsCheckController.java b/mobius-admin/src/main/java/com/mobius/modules/ums/controller/UmsCheckController.java index 5a1b07c..ae51576 100644 --- a/mobius-admin/src/main/java/com/mobius/modules/ums/controller/UmsCheckController.java +++ b/mobius-admin/src/main/java/com/mobius/modules/ums/controller/UmsCheckController.java @@ -7,6 +7,7 @@ import com.mobius.modules.ums.dto.CheckDto; import com.mobius.modules.ums.model.UmsCheck; import com.mobius.modules.ums.service.UmsCheckService; import com.mobius.modules.ums.vo.CheckVo; +import com.mobius.utils.DateUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -45,11 +46,10 @@ public class UmsCheckController { return checkService.checkListByMonth(date); } - @GetMapping("/day") - @ApiOperation(value = "获取今日签到信息") - public CommonResult getDailyCheck(){ - CheckDto dailyCheck = checkService.getDailyCheck(); - return CommonResult.success(dailyCheck); + @GetMapping("") + @ApiOperation(value = "获取某日签到信息") + public CommonResult getDailyCheck(Date date){ + return checkService.getCheckRewardsByDate(DateUtils.getZeroTime(date)); } @PutMapping("") diff --git a/mobius-admin/src/main/java/com/mobius/modules/ums/service/UmsCheckService.java b/mobius-admin/src/main/java/com/mobius/modules/ums/service/UmsCheckService.java index c3eabb8..281424e 100644 --- a/mobius-admin/src/main/java/com/mobius/modules/ums/service/UmsCheckService.java +++ b/mobius-admin/src/main/java/com/mobius/modules/ums/service/UmsCheckService.java @@ -37,4 +37,6 @@ public interface UmsCheckService extends IService { CheckDto getCheckDto(UmsCheck check); + + CommonResult getCheckRewardsByDate(Date date); } diff --git a/mobius-admin/src/main/java/com/mobius/modules/ums/service/impl/UmsCheckServiceImpl.java b/mobius-admin/src/main/java/com/mobius/modules/ums/service/impl/UmsCheckServiceImpl.java index b7a7efb..33d8dfa 100644 --- a/mobius-admin/src/main/java/com/mobius/modules/ums/service/impl/UmsCheckServiceImpl.java +++ b/mobius-admin/src/main/java/com/mobius/modules/ums/service/impl/UmsCheckServiceImpl.java @@ -139,4 +139,10 @@ public class UmsCheckServiceImpl extends ServiceImpl i } + @Override + public CommonResult getCheckRewardsByDate(Date date) { + UmsCheck checkByValidDate = getCheckByValidDate(date); + return CommonResult.success(checkByValidDate.getRewards()); + } + } diff --git a/mobius-admin/src/main/java/com/mobius/modules/ums/vo/RewardVo.java b/mobius-admin/src/main/java/com/mobius/modules/ums/vo/RewardVo.java index 86c67c7..02dbe06 100644 --- a/mobius-admin/src/main/java/com/mobius/modules/ums/vo/RewardVo.java +++ b/mobius-admin/src/main/java/com/mobius/modules/ums/vo/RewardVo.java @@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.validator.constraints.Length; import org.springframework.web.bind.annotation.RequestParam; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import javax.validation.constraints.*; import java.util.Date; /** @@ -30,7 +27,8 @@ public class RewardVo { @NotNull(message = "奖励类型不能为空") @ApiModelProperty("奖励类型 0积分 1邮票") - @Pattern(regexp = "[1|0]") + @Max(value = 1,message = "奖励类型只能是0或者1") + @Min(value = 0,message = "奖励类型只能是0或者1") private Integer type; @NotEmpty(message = "奖励描述不能为空") diff --git a/mobius-portal/pom.xml b/mobius-portal/pom.xml index 1e596d2..30a39e6 100644 --- a/mobius-portal/pom.xml +++ b/mobius-portal/pom.xml @@ -27,6 +27,12 @@ 1.1.8 + + + org.springframework.boot + spring-boot-starter-cache + + org.springframework.boot diff --git a/mobius-portal/src/main/java/com/mobius/modules/lms/dto/PenBriefDTO.java b/mobius-portal/src/main/java/com/mobius/modules/lms/dto/PenBriefDTO.java index d73ef0c..ab5e909 100644 --- a/mobius-portal/src/main/java/com/mobius/modules/lms/dto/PenBriefDTO.java +++ b/mobius-portal/src/main/java/com/mobius/modules/lms/dto/PenBriefDTO.java @@ -43,4 +43,7 @@ public class PenBriefDTO { @ApiModelProperty(value = "是否读") private Integer isRead; + @ApiModelProperty(value = "发信人昵称") + private String nickName; + } diff --git a/mobius-portal/src/main/java/com/mobius/modules/lms/dto/PenInfoDTO.java b/mobius-portal/src/main/java/com/mobius/modules/lms/dto/PenInfoDTO.java index fa55801..1c2796c 100644 --- a/mobius-portal/src/main/java/com/mobius/modules/lms/dto/PenInfoDTO.java +++ b/mobius-portal/src/main/java/com/mobius/modules/lms/dto/PenInfoDTO.java @@ -45,5 +45,8 @@ public class PenInfoDTO { @ApiModelProperty(value = "延迟时间，以小时作为单位") private Integer delayTime; + @ApiModelProperty(value = "发信人昵称") + private String nickName; + } diff --git a/mobius-portal/src/main/java/com/mobius/modules/lms/mapper/LmsPenMapper.java b/mobius-portal/src/main/java/com/mobius/modules/lms/mapper/LmsPenMapper.java index d2fb17e..2682338 100644 --- a/mobius-portal/src/main/java/com/mobius/modules/lms/mapper/LmsPenMapper.java +++ b/mobius-portal/src/main/java/com/mobius/modules/lms/mapper/LmsPenMapper.java @@ -23,13 +23,13 @@ import java.util.Date; public interface LmsPenMapper extends BaseMapper { - @Select("select * from lms_pen where sender_id = #{senderId} and is_delete = 0 order by is_read asc,id desc") + @Select("select * from ums_user,lms_pen where sender_id = #{senderId} and is_delete = 0 and ums_user.id = lms_pen.sender_id order by is_read asc,id desc") IPage selectSenderPenBriefList(Long senderId, IPage page); - @Select("select * from lms_pen where sender_id = #{senderId} and receiver_Id = #{receiverId} and arrive_time > #{arriveTime} and is_delete = 0 order by is_read asc,arrive_time desc") + @Select("select * from ums_user,lms_pen where sender_id = #{senderId} and receiver_Id = #{receiverId} and arrive_time > #{arriveTime} and is_delete = 0 and ums_user.id = lms_pen.sender_id order by is_read asc,arrive_time desc") IPage selectSenderPenBriefList(@Param("senderId") Long senderId, @Param("receiverId") Long receiverId, @Param("arriveTime") Date arriveTime,IPage page); - @Select("select * from lms_pen,lms_incident,lms_letter_content where lms_pen.id = #{id} and lms_pen.incident_id = lms_incident.id and lms_pen.content_id = lms_letter_content.id") + @Select("select * from ums_user,lms_pen,lms_incident,lms_letter_content where lms_pen.id = #{id} and lms_pen.incident_id = lms_incident.id and lms_pen.content_id = lms_letter_content.id and ums_user.id = lms_pen.sender_id") PenInfoDTO selectPenInfo(Long id); } diff --git a/mobius-portal/src/main/java/com/mobius/modules/ums/controller/UmsCheckController.java b/mobius-portal/src/main/java/com/mobius/modules/ums/controller/UmsCheckController.java index 3429b31..7c64ea3 100644 --- a/mobius-portal/src/main/java/com/mobius/modules/ums/controller/UmsCheckController.java +++ b/mobius-portal/src/main/java/com/mobius/modules/ums/controller/UmsCheckController.java @@ -39,7 +39,7 @@ public class UmsCheckController { @ApiOperation("签到") @GetMapping("") public CommonResult userCheck(){ - return CommonResult.success(ResultCode.SUCCESS); + return checkService.userCheck(); } } diff --git a/mobius-portal/src/main/java/com/mobius/modules/ums/controller/UmsUserCheckRecordController.java b/mobius-portal/src/main/java/com/mobius/modules/ums/controller/UmsUserCheckRecordController.java new file mode 100644 index 0000000..3bf08da --- /dev/null +++ b/mobius-portal/src/main/java/com/mobius/modules/ums/controller/UmsUserCheckRecordController.java @@ -0,0 +1,20 @@ +package com.mobius.modules.ums.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author Sqh + * @since 2022-06-17 + */ +@RestController +@RequestMapping("/ums/umsUserCheckRecord") +public class UmsUserCheckRecordController { + +} + diff --git a/mobius-portal/src/main/java/com/mobius/modules/ums/mapper/UmsUserCheckRecordMapper.java b/mobius-portal/src/main/java/com/mobius/modules/ums/mapper/UmsUserCheckRecordMapper.java new file mode 100644 index 0000000..c671f3e --- /dev/null +++ b/mobius-portal/src/main/java/com/mobius/modules/ums/mapper/UmsUserCheckRecordMapper.java @@ -0,0 +1,16 @@ +package com.mobius.modules.ums.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mobius.modules.ums.model.UmsUserCheckRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author Sqh + * @since 2022-06-17 + */ +public interface UmsUserCheckRecordMapper extends BaseMapper { + +} diff --git a/mobius-portal/src/main/java/com/mobius/modules/ums/model/UmsUserCheckRecord.java b/mobius-portal/src/main/java/com/mobius/modules/ums/model/UmsUserCheckRecord.java new file mode 100644 index 0000000..4a6bef8 --- /dev/null +++ b/mobius-portal/src/main/java/com/mobius/modules/ums/model/UmsUserCheckRecord.java @@ -0,0 +1,50 @@ +package com.mobius.modules.ums.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +/** + *

+ * + *

+ * + * @author Sqh + * @since 2022-06-17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ums_user_check_record") +@ApiModel(value="UmsUserCheckRecord对象", description="") +@AllArgsConstructor +@NoArgsConstructor +public class UmsUserCheckRecord implements Serializable { + + private static final long serialVersionUID=1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "签到用户id") + private Integer userId; + + @ApiModelProperty(value = "记录时间") + private Date createDate; + + @ApiModelProperty(value = "奖励id") + private Integer checkId; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + + +} diff --git a/mobius-portal/src/main/java/com/mobius/modules/ums/model/UmsUserStampRelation.java b/mobius-portal/src/main/java/com/mobius/modules/ums/model/UmsUserStampRelation.java index babacb3..0892efe 100644 --- a/mobius-portal/src/main/java/com/mobius/modules/ums/model/UmsUserStampRelation.java +++ b/mobius-portal/src/main/java/com/mobius/modules/ums/model/UmsUserStampRelation.java @@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; +import lombok.*; import java.io.Serializable; import java.util.Date; @@ -23,6 +21,8 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) @TableName("ums_user_stamp_relation") @ApiModel(value="UmsUserStampRelation对象", description="") +@AllArgsConstructor +@NoArgsConstructor public class UmsUserStampRelation implements Serializable { private static final long serialVersionUID=1L; diff --git a/mobius-portal/src/main/java/com/mobius/modules/ums/service/UmsCheckService.java b/mobius-portal/src/main/java/com/mobius/modules/ums/service/UmsCheckService.java index 76e6bb5..cab1121 100644 --- a/mobius-portal/src/main/java/com/mobius/modules/ums/service/UmsCheckService.java +++ b/mobius-portal/src/main/java/com/mobius/modules/ums/service/UmsCheckService.java @@ -27,4 +27,6 @@ public interface UmsCheckService extends IService { CheckDto getDailyCheck(); CheckDto getCheckDto(UmsCheck check); + + } diff --git a/mobius-portal/src/main/java/com/mobius/modules/ums/service/UmsUserCheckRecordService.java b/mobius-portal/src/main/java/com/mobius/modules/ums/service/UmsUserCheckRecordService.java new file mode 100644 index 0000000..3c54623 --- /dev/null +++ b/mobius-portal/src/main/java/com/mobius/modules/ums/service/UmsUserCheckRecordService.java @@ -0,0 +1,18 @@ +package com.mobius.modules.ums.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.mobius.modules.ums.model.UmsUserCheckRecord; + +/** + *

+ * 服务类 + *

+ * + * @author Sqh + * @since 2022-06-17 + */ +public interface UmsUserCheckRecordService extends IService { + + UmsUserCheckRecord getUserCheckRecord(Integer userId, Integer checkId); + +} diff --git a/mobius-portal/src/main/java/com/mobius/modules/ums/service/impl/UmsCheckServiceImpl.java b/mobius-portal/src/main/java/com/mobius/modules/ums/service/impl/UmsCheckServiceImpl.java index cddab50..c6b0953 100644 --- a/mobius-portal/src/main/java/com/mobius/modules/ums/service/impl/UmsCheckServiceImpl.java +++ b/mobius-portal/src/main/java/com/mobius/modules/ums/service/impl/UmsCheckServiceImpl.java @@ -1,6 +1,8 @@ package com.mobius.modules.ums.service.impl; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mobius.common.api.CommonResult; @@ -9,10 +11,10 @@ import com.mobius.common.service.RedisService; import com.mobius.common.util.DateUtils; import com.mobius.modules.ums.dto.CheckDto; import com.mobius.modules.ums.mapper.UmsCheckMapper; -import com.mobius.modules.ums.model.UmsCheck; -import com.mobius.modules.ums.model.UmsReward; -import com.mobius.modules.ums.service.UmsCheckService; -import com.mobius.modules.ums.service.UmsRewardService; +import com.mobius.modules.ums.mapper.UmsUserCheckRecordMapper; +import com.mobius.modules.ums.model.*; +import com.mobius.modules.ums.service.*; +import io.swagger.annotations.ApiModelProperty; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,6 +42,12 @@ public class UmsCheckServiceImpl extends ServiceImpl i private RedisService redisService; @Autowired private UmsRewardService rewardService; + @Autowired + private UmsUserCheckRecordService recordService; + @Autowired + private UmsUserService userService; + @Autowired + private UmsUserStampRelationService relationService; @@ -51,10 +59,19 @@ public class UmsCheckServiceImpl extends ServiceImpl i @Override public CommonResult userCheck() { + UmsUser currentUser = userService.getCurrentUser(); CheckDto dailyCheck = getDailyCheck(); - if (dailyCheck!=null){ - + if (dailyCheck==null){ + return CommonResult.success("今日无签到"); } + UmsUserCheckRecord userCheckRecord = recordService.getUserCheckRecord(currentUser.getId(), dailyCheck.getId()); + if (userCheckRecord!=null){ + return CommonResult.failed("今日已经签到过了"); + } + getCheckReward(dailyCheck.getRewards(),currentUser); + + + recordService.save(new UmsUserCheckRecord(0,currentUser.getId(),new Date(),dailyCheck.getId(),new Date())); return CommonResult.success(ResultCode.SUCCESS); } @@ -96,4 +113,24 @@ public class UmsCheckServiceImpl extends ServiceImpl i return new CheckDto(check.getId(),check.getValidTime(),rewards); } + + + void getCheckReward(List rewards, UmsUser user){ + + List relations = new ArrayList<>(); + Integer value = 0; + for (UmsReward reward: rewards){ + if (reward.getType()==0){ + value+=reward.getValue(); + }else if(reward.getType()==1) { + relations.add(new UmsUserStampRelation(0L,user.getId(),1L,new Date(),new Date())); + } + } + user.setGrowValue(user.getGrowValue()+value); + userService.updateUserById(user); + + for(UmsUserStampRelation relation:relations) { + relationService.save(relation); + } + } } diff --git a/mobius-portal/src/main/java/com/mobius/modules/ums/service/impl/UmsUserCheckRecordServiceImpl.java b/mobius-portal/src/main/java/com/mobius/modules/ums/service/impl/UmsUserCheckRecordServiceImpl.java new file mode 100644 index 0000000..2a9d472 --- /dev/null +++ b/mobius-portal/src/main/java/com/mobius/modules/ums/service/impl/UmsUserCheckRecordServiceImpl.java @@ -0,0 +1,34 @@ +package com.mobius.modules.ums.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mobius.modules.ums.mapper.UmsUserCheckRecordMapper; +import com.mobius.modules.ums.model.UmsUserCheckRecord; +import com.mobius.modules.ums.service.UmsUserCheckRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author Sqh + * @since 2022-06-17 + */ +@Service +public class UmsUserCheckRecordServiceImpl extends ServiceImpl implements UmsUserCheckRecordService { + + @Autowired + private UmsUserCheckRecordMapper recordMapper; + @Override + public UmsUserCheckRecord getUserCheckRecord(Integer userId, Integer checkId) { + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("user_id",userId); + + wrapper.eq("check_id",checkId); + + return recordMapper.selectOne(wrapper); + } +} diff --git a/mobius-portal/src/main/resources/application.yml b/mobius-portal/src/main/resources/application.yml index af5acee..57a49d7 100644 --- a/mobius-portal/src/main/resources/application.yml +++ b/mobius-portal/src/main/resources/application.yml @@ -7,6 +7,8 @@ spring: profiles: active: dev + cache: + type: redis mybatis-plus: mapper-locations: classpath:/mapper/**/*.xml global-config: diff --git a/mobius-portal/src/test/java/com/mobius/modules/lms/mapper/LmsPenMapperTest.java b/mobius-portal/src/test/java/com/mobius/modules/lms/mapper/LmsPenMapperTest.java index 0ad3676..a1d102f 100644 --- a/mobius-portal/src/test/java/com/mobius/modules/lms/mapper/LmsPenMapperTest.java +++ b/mobius-portal/src/test/java/com/mobius/modules/lms/mapper/LmsPenMapperTest.java @@ -1,31 +1,31 @@ -package com.mobius.modules.lms.mapper; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.mobius.modules.lms.dto.PenBriefDTO; -import com.mobius.modules.lms.dto.PenInfoDTO; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -/** - * @Author: hocztms - * @Description: - * @Date Created in 2022-05-13-0:37 - * @Modified By: - */ -@SpringBootTest -class LmsPenMapperTest { - - @Autowired - private LmsPenMapper lmsPenMapper; - - @Test - public void test(){ - IPage senderPenBriefList = lmsPenMapper.selectSenderPenBriefList(3L, new Page<>(1, 3)); - System.out.println(senderPenBriefList.getRecords().toString()); - PenInfoDTO penInfoDTO = lmsPenMapper.selectPenInfo(2L); - System.out.println(penInfoDTO.toString()); - } - -} \ No newline at end of file +//package com.mobius.modules.lms.mapper; +// +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +//import com.mobius.modules.lms.dto.PenBriefDTO; +//import com.mobius.modules.lms.dto.PenInfoDTO; +//import org.junit.jupiter.api.Test; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.context.SpringBootTest; +// +///** +// * @Author: hocztms +// * @Description: +// * @Date Created in 2022-05-13-0:37 +// * @Modified By: +// */ +//@SpringBootTest +//class LmsPenMapperTest { +// +// @Autowired +// private LmsPenMapper lmsPenMapper; +// +// @Test +// public void test(){ +// IPage senderPenBriefList = lmsPenMapper.selectSenderPenBriefList(3L, new Page<>(1, 3)); +// System.out.println(senderPenBriefList.getRecords().toString()); +// PenInfoDTO penInfoDTO = lmsPenMapper.selectPenInfo(2L); +// System.out.println(penInfoDTO.toString()); +// } +// +//} \ No newline at end of file diff --git a/mobius-portal/src/test/java/com/mobius/modules/lms/service/impl/LmsVerifyLetterServiceImplTest.java b/mobius-portal/src/test/java/com/mobius/modules/lms/service/impl/LmsVerifyLetterServiceImplTest.java index 4111a64..bc7a80e 100644 --- a/mobius-portal/src/test/java/com/mobius/modules/lms/service/impl/LmsVerifyLetterServiceImplTest.java +++ b/mobius-portal/src/test/java/com/mobius/modules/lms/service/impl/LmsVerifyLetterServiceImplTest.java @@ -1,24 +1,24 @@ -package com.mobius.modules.lms.service.impl; - -import com.mobius.modules.lms.service.LmsVerifyLetterService; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import static org.junit.jupiter.api.Assertions.*; - -/** - * @author Sqh - * @date 2022/5/12 - */ -@SpringBootTest -class LmsVerifyLetterServiceImplTest { - @Autowired - private LmsVerifyLetterService verifyLetterService; - - @Test - void verifyLetterContent() { - String testContent = "ausdhauhduahsdas"; - verifyLetterService.verifyLetterContent(testContent); - } -} \ No newline at end of file +//package com.mobius.modules.lms.service.impl; +// +//import com.mobius.modules.lms.service.LmsVerifyLetterService; +//import org.junit.jupiter.api.Test; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.context.SpringBootTest; +// +//import static org.junit.jupiter.api.Assertions.*; +// +///** +// * @author Sqh +// * @date 2022/5/12 +// */ +//@SpringBootTest +//class LmsVerifyLetterServiceImplTest { +// @Autowired +// private LmsVerifyLetterService verifyLetterService; +// +// @Test +// void verifyLetterContent() { +// String testContent = "ausdhauhduahsdas"; +// verifyLetterService.verifyLetterContent(testContent); +// } +//} \ No newline at end of file diff --git a/mobius-portal/src/test/java/com/mobius/modules/ums/mapper/UmsUserMapperTest.java b/mobius-portal/src/test/java/com/mobius/modules/ums/mapper/UmsUserMapperTest.java index 13664fc..13b96a6 100644 --- a/mobius-portal/src/test/java/com/mobius/modules/ums/mapper/UmsUserMapperTest.java +++ b/mobius-portal/src/test/java/com/mobius/modules/ums/mapper/UmsUserMapperTest.java @@ -1,28 +1,28 @@ -package com.mobius.modules.ums.mapper; - - import com.baomidou.mybatisplus.core.metadata.IPage; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - import com.mobius.modules.ums.dto.UserListDto; - import org.junit.jupiter.api.Test; - import org.springframework.beans.factory.annotation.Autowired; - import org.springframework.boot.test.context.SpringBootTest; - - import static org.junit.jupiter.api.Assertions.*; - -/** - * @Author: hocztms - * @Description: - * @Date Created in 2022-06-07-21:57 - * @Modified By: - */ -@SpringBootTest -class UmsUserMapperTest { - - @Autowired - private UmsUserMapper userMapper; - @Test - void selectUserListByNickName() { - IPage h = userMapper.selectUserListByNickName("h", new Page<>(1, 5)); - System.out.println(h.getRecords().toString()); - } -} \ No newline at end of file +//package com.mobius.modules.ums.mapper; +// +// import com.baomidou.mybatisplus.core.metadata.IPage; +// import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +// import com.mobius.modules.ums.dto.UserListDto; +// import org.junit.jupiter.api.Test; +// import org.springframework.beans.factory.annotation.Autowired; +// import org.springframework.boot.test.context.SpringBootTest; +// +// import static org.junit.jupiter.api.Assertions.*; +// +///** +// * @Author: hocztms +// * @Description: +// * @Date Created in 2022-06-07-21:57 +// * @Modified By: +// */ +//@SpringBootTest +//class UmsUserMapperTest { +// +// @Autowired +// private UmsUserMapper userMapper; +// @Test +// void selectUserListByNickName() { +// IPage h = userMapper.selectUserListByNickName("h", new Page<>(1, 5)); +// System.out.println(h.getRecords().toString()); +// } +//} \ No newline at end of file diff --git a/mobius-portal/src/test/java/com/mobius/modules/ums/service/impl/UserInfoServiceImplTest.java b/mobius-portal/src/test/java/com/mobius/modules/ums/service/impl/UserInfoServiceImplTest.java index cf45cba..fa684e6 100644 --- a/mobius-portal/src/test/java/com/mobius/modules/ums/service/impl/UserInfoServiceImplTest.java +++ b/mobius-portal/src/test/java/com/mobius/modules/ums/service/impl/UserInfoServiceImplTest.java @@ -1,44 +1,44 @@ -package com.mobius.modules.ums.service.impl; - -import com.mobius.modules.lms.service.LmsVerifyLetterService; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static org.junit.jupiter.api.Assertions.*; - -/** - * @author Sqh - * @date 2022/6/13 - */ -class UserInfoServiceImplTest { - - public static final Pattern timeRegex= Pattern.compile("^([0-1][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$"); - - @Test - void verifyLetterContent() { - String str = "25:15:00"; - Matcher matcher = timeRegex.matcher(str); - System.out.println(matcher.find()); - - str = "23:15:00"; - matcher = timeRegex.matcher(str); - System.out.println(matcher.find()); - - str = "00:15:00"; - matcher = timeRegex.matcher(str); - System.out.println(matcher.find()); - - str = "02:15:00"; - matcher = timeRegex.matcher(str); - System.out.println(matcher.find()); - - str = "2:15:00"; - matcher = timeRegex.matcher(str); - System.out.println(matcher.find()); - - } - -} \ No newline at end of file +//package com.mobius.modules.ums.service.impl; +// +//import com.mobius.modules.lms.service.LmsVerifyLetterService; +//import org.junit.jupiter.api.Test; +//import org.springframework.beans.factory.annotation.Autowired; +// +//import java.util.regex.Matcher; +//import java.util.regex.Pattern; +// +//import static org.junit.jupiter.api.Assertions.*; +// +///** +// * @author Sqh +// * @date 2022/6/13 +// */ +//class UserInfoServiceImplTest { +// +// public static final Pattern timeRegex= Pattern.compile("^([0-1][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$"); +// +// @Test +// void verifyLetterContent() { +// String str = "25:15:00"; +// Matcher matcher = timeRegex.matcher(str); +// System.out.println(matcher.find()); +// +// str = "23:15:00"; +// matcher = timeRegex.matcher(str); +// System.out.println(matcher.find()); +// +// str = "00:15:00"; +// matcher = timeRegex.matcher(str); +// System.out.println(matcher.find()); +// +// str = "02:15:00"; +// matcher = timeRegex.matcher(str); +// System.out.println(matcher.find()); +// +// str = "2:15:00"; +// matcher = timeRegex.matcher(str); +// System.out.println(matcher.find()); +// +// } +// +//} \ No newline at end of file -- GitLab