diff --git a/src/main/java/com/zh/project0512/controller/ScheduleController.java b/src/main/java/com/zh/project0512/controller/ScheduleController.java index b6348cc..2a6df92 100644 --- a/src/main/java/com/zh/project0512/controller/ScheduleController.java +++ b/src/main/java/com/zh/project0512/controller/ScheduleController.java @@ -126,71 +126,5 @@ public class ScheduleController { taskService.update(new UpdateWrapper().eq("id",taskId).set("status",3)); } } -// @Scheduled(cron = "0 0/1 * * * ? ") -// @Scheduled(cron = "0 0 0 1 1/1 ?") -// public void taskRank() { -// //获取开始时间和结束时间 -// Calendar cal = Calendar.getInstance(); -// cal.setTime(new Date()); -// cal.add(Calendar.MONTH,-1); -// cal.set(Calendar.DAY_OF_MONTH,1); -// cal.set(Calendar.HOUR_OF_DAY, 0); -// cal.set(Calendar.MINUTE, 0); -// cal.set(Calendar.SECOND, 0); -// Date timeStart = cal.getTime(); -// cal.set(Calendar.DAY_OF_MONTH,cal.getActualMaximum(Calendar.DAY_OF_MONTH)); -// Date timeEnd = cal.getTime(); -// //获取员工排名进排名数据库 -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.groupBy("u.id"); -// queryWrapper.orderByDesc("value"); -// List rankUserList = qywxDepartmentUserLinkMapper.getUserRankList(queryWrapper); -// if (rankUserList != null && rankUserList.size()>0){ -// for (RankListVo rankListVo : rankUserList) { -// //查询是否有上一月记录，如果有就减去上一月传播值，没有则直接添加 -// QueryWrapper queryWrapper2 = new QueryWrapper<>(); -// queryWrapper2.eq("linkId",rankListVo.getLinkId()); -// queryWrapper2.eq("type",2);//2.员工 -// queryWrapper2.orderByDesc("dateStart"); -// queryWrapper2.last("limit 1"); -// Rank rank = rankMapper.selectOne(queryWrapper2); -// if (rank != null){ -// rankListVo.setValue(rankListVo.getValue() - rank.getValue()); -// } -// Rank rank2 = new Rank(); -// PropertyUtils.copyProperties(rankListVo,rank2); -// rank2.setType(2);//2.员工 -// rank2.setDateStart(timeStart); -// rank2.setDateEnd(timeEnd); -// rank2.setCreateDate(new Date()); -// rankMapper.insert(rank2); -// } -// } -// //计算经销商排名进排名数据库 -// QueryWrapper queryWrapper3 = new QueryWrapper<>(); -// queryWrapper3.groupBy("qd.departmentId"); -// queryWrapper3.orderByDesc("value"); -// List rankDepartmentList = qywxDepartmentUserLinkMapper.getDepartmentRankList(queryWrapper3); -// if (rankDepartmentList != null && rankDepartmentList.size()>0){ -// for (RankListVo rankListVo : rankDepartmentList) { -// //查询是否有上一月记录，如果有就减去上一月传播值，没有则直接添加 -// QueryWrapper queryWrapper2 = new QueryWrapper<>(); -// queryWrapper2.eq("linkId",rankListVo.getLinkId()); -// queryWrapper2.eq("type",1);//1.经销商 -// queryWrapper2.orderByDesc("dateStart"); -// queryWrapper2.last("limit 1"); -// Rank rank = rankMapper.selectOne(queryWrapper2); -// if (rank != null){ -// rankListVo.setValue(rankListVo.getValue() - rank.getValue()); -// } -// Rank rank2 = new Rank(); -// PropertyUtils.copyProperties(rankListVo,rank2); -// rank2.setType(1);//1.经销商 -// rank2.setDateStart(timeStart); -// rank2.setDateEnd(timeEnd); -// rank2.setCreateDate(new Date()); -// rankMapper.insert(rank2); -// } -// } -// } + } diff --git a/src/main/java/com/zh/project0512/controller/manage/UserController.java b/src/main/java/com/zh/project0512/controller/manage/UserController.java index 308fa3e..9942184 100644 --- a/src/main/java/com/zh/project0512/controller/manage/UserController.java +++ b/src/main/java/com/zh/project0512/controller/manage/UserController.java @@ -87,7 +87,7 @@ public class UserController { .and(param.getDepartment() != null, q -> q.like("t2.name", param.getDepartment()) .or(o -> o.like("t3.name", param.getDepartment()))) .like(param.getName() != null, "t1.name", param.getName()); - return Result.success(userService.pageList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), qw)); + return Result.success(userService.userDpList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), qw)); } @Operation(summary = "导出excel", description = "成员导出") @@ -105,7 +105,7 @@ public class UserController { .and(param.getDepartment() != null, q -> q.like("t2.name", param.getDepartment()) .or(o -> o.like("t3.name", param.getDepartment()))) .like(param.getName() != null, "t1.name", param.getName()); - IPage iPage = userService.pageList(MybatisPlusUtil.SetNumPage(1, 10000), qw); + IPage iPage = userService.userDpList(MybatisPlusUtil.SetNumPage(1, 10000), qw); Workbook wb = ExcelUtil.writeToExcelByList(array, iPage.getRecords()); OutputStream output = response.getOutputStream(); diff --git a/src/main/java/com/zh/project0512/controller/wxApp/QYWXUController.java b/src/main/java/com/zh/project0512/controller/wxApp/QYWXUController.java index 7ed7552..8e63a79 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/QYWXUController.java +++ b/src/main/java/com/zh/project0512/controller/wxApp/QYWXUController.java @@ -40,6 +40,10 @@ public class QYWXUController { if (null == openid) { return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "无效token"); } + User user = userService.selByOpenid(openid); + if(null == user){ + return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "未知用户"); + } String access_token = httpUtil.qywxGetToken(); JSONObject res = httpUtil.qywxUserSession(access_token, obj.getString("code")); String userid = res.getString("userid"); diff --git a/src/main/java/com/zh/project0512/controller/wxApp/RankUController.java b/src/main/java/com/zh/project0512/controller/wxApp/RankUController.java index c746874..0c4e9a3 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/RankUController.java +++ b/src/main/java/com/zh/project0512/controller/wxApp/RankUController.java @@ -75,7 +75,7 @@ public class RankUController { public Result list(@Validated @RequestBody RankParam param) { Page pg = MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()); QueryWrapper qw = new QueryWrapper<>(); - LocalDateTime now = param.getDateTime() != null ? LocalDateTime.now() : param.getDateTime(); + LocalDateTime now = param.getDateTime() == null ? LocalDateTime.now() : param.getDateTime(); qw.eq("date_format(t1.createAt, '%Y-%m')", now.format(DateTimeFormatter.ofPattern("yyyy-MM"))); IPage page = (param.getType() != null && param.getType() == 1) ? userEffectRecordsMapper.rankByDepartment(pg, qw) : userEffectRecordsMapper.rankByUser(pg, qw); return Result.success(page.getRecords(), "请求成功"); diff --git a/src/main/java/com/zh/project0512/mapper/QywxDepartmentUserLinkMapper.java b/src/main/java/com/zh/project0512/mapper/QywxDepartmentUserLinkMapper.java index 216163c..03a19e5 100644 --- a/src/main/java/com/zh/project0512/mapper/QywxDepartmentUserLinkMapper.java +++ b/src/main/java/com/zh/project0512/mapper/QywxDepartmentUserLinkMapper.java @@ -12,7 +12,4 @@ import java.util.List; public interface QywxDepartmentUserLinkMapper extends BaseMapper { - List getUserRankList(@Param("ew") Wrapper queryWrapper); - - List getDepartmentRankList(@Param("ew") QueryWrapper queryWrapper2); } diff --git a/src/main/java/com/zh/project0512/mapper/UserMapper.java b/src/main/java/com/zh/project0512/mapper/UserMapper.java index 9dc13cc..f9b1951 100644 --- a/src/main/java/com/zh/project0512/mapper/UserMapper.java +++ b/src/main/java/com/zh/project0512/mapper/UserMapper.java @@ -31,14 +31,15 @@ public interface UserMapper extends BaseMapper { @Select("UPDATE user set token=#{token},lastLoginAt=#{time} where openid=#{openid}") void updByOpenid(String openid, String token, LocalDateTime time); - @Select("SELECT t1.id,t1.name,t1.tel,t1.avatar,t1.main_department,t1.sub_department,t1.points,t1.historyPoints,t1.creatAt,t1.updateAt,t1.lastLoginAt" + - ",t2.name as main_departmentName,t3.name as sub_departmentName " + - "from user as t1 " + - "left join qywxDepartment as t2 on t1.main_department = t2.departmentId " + - "left join qywxDepartment as t3 on t1.sub_department = t3.departmentId " + - "${ew.customSqlSegment} " + - "ORDER BY lastLoginAt DESC,updateAt DESC,creatAt DESC") - IPage pageList(IPage iPage, @Param("ew") Wrapper queryWrapper); +// @Select("SELECT t1.id,t1.name,t1.tel,t1.avatar,t1.main_department,t1.sub_department,t1.points,t1.historyPoints,t1.creatAt,t1.updateAt,t1.lastLoginAt" + +// ",t2.name as main_departmentName,t3.name as sub_departmentName,t4.department " + +// "from user as t1 " + +// "left join qywxDepartment as t2 on t1.main_department = t2.departmentId " + +// "left join qywxDepartment as t3 on t1.sub_department = t3.departmentId " + +// "left join (SELECT t.*,d.name as department from qywxDepartmentUserLink t left join qywxDepartment d on t.departmentId = d.departmentId) as t4 on t1.openid = t4.openid " + +// "${ew.customSqlSegment} " + +// "ORDER BY lastLoginAt DESC,updateAt DESC,creatAt DESC") + IPage userDpList(IPage iPage, @Param("ew") Wrapper queryWrapper); @Update("UPDATE user set points = points + #{record},historyPoints = historyPoints + #{record} WHERE id = #{userId}") void updPoints(int userId, int record); diff --git a/src/main/java/com/zh/project0512/model/Task.java b/src/main/java/com/zh/project0512/model/Task.java index 72b33a4..22dfd33 100644 --- a/src/main/java/com/zh/project0512/model/Task.java +++ b/src/main/java/com/zh/project0512/model/Task.java @@ -18,6 +18,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -75,6 +76,7 @@ public class Task extends Model { @Schema(title="封面",description = "封面不能为空") @TableField("coverUrl") @NotNull(message = "封面不能为空",groups = {TaskValidGroup1.class}) + @Min(value=1) private String coverUrl; /** diff --git a/src/main/java/com/zh/project0512/service/IUserService.java b/src/main/java/com/zh/project0512/service/IUserService.java index 2468fd2..d34eb65 100644 --- a/src/main/java/com/zh/project0512/service/IUserService.java +++ b/src/main/java/com/zh/project0512/service/IUserService.java @@ -23,5 +23,5 @@ public interface IUserService extends IService { public User selByOpenid(String openid); Map selByOpenid2(@Param("openid") String openid); public void updByOpenid(String openid, String token, LocalDateTime time); - IPage pageList(IPage iPage, @Param("ew") Wrapper queryWrapper); + IPage userDpList(IPage iPage, @Param("ew") Wrapper queryWrapper); } diff --git a/src/main/java/com/zh/project0512/serviceImpl/UserServiceImpl.java b/src/main/java/com/zh/project0512/serviceImpl/UserServiceImpl.java index 6f67978..e4f69f5 100644 --- a/src/main/java/com/zh/project0512/serviceImpl/UserServiceImpl.java +++ b/src/main/java/com/zh/project0512/serviceImpl/UserServiceImpl.java @@ -37,7 +37,7 @@ public class UserServiceImpl extends ServiceImpl implements IU public void updByOpenid(String openid, String token, LocalDateTime time) { userMapper.updByOpenid(openid, token, time); } - public IPage pageList(IPage iPage, @Param("ew") Wrapper queryWrapper){ - return userMapper.pageList(iPage,queryWrapper); + public IPage userDpList(IPage iPage, @Param("ew") Wrapper queryWrapper){ + return userMapper.userDpList(iPage,queryWrapper); } } diff --git a/src/main/resources/mapper/QywxDepartmentUserLinkMapper.xml b/src/main/resources/mapper/QywxDepartmentUserLinkMapper.xml deleted file mode 100644 index c6a8909..0000000 --- a/src/main/resources/mapper/QywxDepartmentUserLinkMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml new file mode 100644 index 0000000..3cff808 --- /dev/null +++ b/src/main/resources/mapper/UserMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + +