diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.java index 027f620c69..c0fbb65c81 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.java @@ -7,7 +7,7 @@ import java.util.Map; public interface HomeMapper { - List queryStore(Long userId); + List queryStore(Map param); List queryHistory(); diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.xml index a40f38b15a..b29bcc5ef3 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.xml @@ -12,6 +12,9 @@ on s.panel_group_id = g.id where s.user_id = #{userId} and FIND_IN_SET( g.id, cids ) + + and #{lastTime} > s.create_time + order by s.create_time desc @@ -33,6 +36,9 @@ and s.type = 1 ) ) + + and #{lastTime} > s.create_time + order by s.create_time desc diff --git a/backend/src/main/java/io/dataease/job/sechedule/strategy/TaskHandler.java b/backend/src/main/java/io/dataease/job/sechedule/strategy/TaskHandler.java index be4b8e633c..4ec969cb64 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/strategy/TaskHandler.java +++ b/backend/src/main/java/io/dataease/job/sechedule/strategy/TaskHandler.java @@ -78,7 +78,7 @@ public abstract class TaskHandler implements InitializingBean { } private String getDayOfWeek(Calendar instance) { - int index = instance.get(Calendar.DAY_OF_WEEK) - 1; + int index = instance.get(Calendar.DAY_OF_WEEK); return week[index]; } diff --git a/backend/src/main/java/io/dataease/mobile/api/DirApi.java b/backend/src/main/java/io/dataease/mobile/api/DirApi.java index e7a87c0ab4..ac3f9e4f3c 100644 --- a/backend/src/main/java/io/dataease/mobile/api/DirApi.java +++ b/backend/src/main/java/io/dataease/mobile/api/DirApi.java @@ -3,20 +3,16 @@ package io.dataease.mobile.api; import io.dataease.mobile.dto.DirItemDTO; import io.dataease.mobile.dto.DirRequest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; -@Api(tags = "移动端:目录") @RequestMapping("/mobile/dir") public interface DirApi { - @ApiOperation("查询") @PostMapping("/query") List query(@RequestBody DirRequest request); } diff --git a/backend/src/main/java/io/dataease/mobile/api/HomeApi.java b/backend/src/main/java/io/dataease/mobile/api/HomeApi.java index f92acb8dc5..4d1e36b95a 100644 --- a/backend/src/main/java/io/dataease/mobile/api/HomeApi.java +++ b/backend/src/main/java/io/dataease/mobile/api/HomeApi.java @@ -1,25 +1,21 @@ package io.dataease.mobile.api; +import io.dataease.commons.utils.Pager; import io.dataease.mobile.dto.HomeItemDTO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; +import io.dataease.mobile.dto.HomeRequest; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; -@Api(tags = "移动端:首页") @RequestMapping("/mobile/home") public interface HomeApi { - @ApiOperation("查询") - @ApiImplicitParam(value = "类型", name = "type", paramType = "path", allowableValues = "{@code 0(收藏), 1(历史), 2(分享)}") - @PostMapping("/query/{type}") - List query(@PathVariable Integer type); + @PostMapping("/query") + Pager> query(@RequestBody HomeRequest request); + - @ApiOperation("详情") - @ApiImplicitParam(value = "ID", name = "id", paramType = "path") @PostMapping("/detail/{id}") Object detail(@PathVariable String id); diff --git a/backend/src/main/java/io/dataease/mobile/api/MeApi.java b/backend/src/main/java/io/dataease/mobile/api/MeApi.java index 10fcac38c9..c3f6278a05 100644 --- a/backend/src/main/java/io/dataease/mobile/api/MeApi.java +++ b/backend/src/main/java/io/dataease/mobile/api/MeApi.java @@ -1,18 +1,14 @@ package io.dataease.mobile.api; import io.dataease.mobile.dto.MeItemDTO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; -@Api(tags = "移动端:我的") @RequestMapping("/mobile/me") public interface MeApi { - @ApiOperation("查询个人信息") @PostMapping("/query") MeItemDTO query(); } diff --git a/backend/src/main/java/io/dataease/mobile/dto/DirItemDTO.java b/backend/src/main/java/io/dataease/mobile/dto/DirItemDTO.java index f4f607a316..90137ce408 100644 --- a/backend/src/main/java/io/dataease/mobile/dto/DirItemDTO.java +++ b/backend/src/main/java/io/dataease/mobile/dto/DirItemDTO.java @@ -1,21 +1,14 @@ package io.dataease.mobile.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @Data -@ApiModel("目录数据实体") public class DirItemDTO implements Serializable { - @ApiModelProperty("ID") private String id; - @ApiModelProperty("名称") private String text; - @ApiModelProperty(value = "类型", allowableValues = "{@code folder, panel}") private String type; - @ApiModelProperty("子集数") private Integer subs; } diff --git a/backend/src/main/java/io/dataease/mobile/dto/DirRequest.java b/backend/src/main/java/io/dataease/mobile/dto/DirRequest.java index 95a28f926f..f1b81874c6 100644 --- a/backend/src/main/java/io/dataease/mobile/dto/DirRequest.java +++ b/backend/src/main/java/io/dataease/mobile/dto/DirRequest.java @@ -7,13 +7,10 @@ import lombok.Data; import java.io.Serializable; @Data -@ApiModel("目录查询条件") public class DirRequest implements Serializable { - @ApiModelProperty("父ID") private String pid; - @ApiModelProperty("名称") private String name; } diff --git a/backend/src/main/java/io/dataease/mobile/dto/HomeItemDTO.java b/backend/src/main/java/io/dataease/mobile/dto/HomeItemDTO.java index 18e9085683..35905dc07f 100644 --- a/backend/src/main/java/io/dataease/mobile/dto/HomeItemDTO.java +++ b/backend/src/main/java/io/dataease/mobile/dto/HomeItemDTO.java @@ -1,18 +1,13 @@ package io.dataease.mobile.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import java.io.Serializable; @Data -@ApiModel("首页数据实体") public class HomeItemDTO implements Serializable { - @ApiModelProperty("ID") private String id; - @ApiModelProperty("标题") private String title; - @ApiModelProperty("时间") private Long time; } diff --git a/backend/src/main/java/io/dataease/mobile/dto/HomeRequest.java b/backend/src/main/java/io/dataease/mobile/dto/HomeRequest.java new file mode 100644 index 0000000000..f427098575 --- /dev/null +++ b/backend/src/main/java/io/dataease/mobile/dto/HomeRequest.java @@ -0,0 +1,13 @@ +package io.dataease.mobile.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class HomeRequest implements Serializable { + + private Integer type; + + private Long lastTime; +} diff --git a/backend/src/main/java/io/dataease/mobile/dto/MeItemDTO.java b/backend/src/main/java/io/dataease/mobile/dto/MeItemDTO.java index ca9f573c60..77643c736d 100644 --- a/backend/src/main/java/io/dataease/mobile/dto/MeItemDTO.java +++ b/backend/src/main/java/io/dataease/mobile/dto/MeItemDTO.java @@ -1,16 +1,12 @@ package io.dataease.mobile.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import java.io.Serializable; @Data -@ApiModel("个人信息") public class MeItemDTO implements Serializable { - @ApiModelProperty("组织名称") private String deptName; - @ApiModelProperty("创建时间") private Long createTime; } diff --git a/backend/src/main/java/io/dataease/mobile/server/HomeServer.java b/backend/src/main/java/io/dataease/mobile/server/HomeServer.java index 3c923935cd..822b8483b9 100644 --- a/backend/src/main/java/io/dataease/mobile/server/HomeServer.java +++ b/backend/src/main/java/io/dataease/mobile/server/HomeServer.java @@ -1,7 +1,9 @@ package io.dataease.mobile.server; +import io.dataease.commons.utils.Pager; import io.dataease.mobile.api.HomeApi; import io.dataease.mobile.dto.HomeItemDTO; +import io.dataease.mobile.dto.HomeRequest; import io.dataease.mobile.service.HomeService; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -13,13 +15,17 @@ public class HomeServer implements HomeApi { @Resource private HomeService homeService; + + @Override - public List query(Integer type) { - return homeService.query(type); + public Pager> query(HomeRequest request) { + return homeService.query(request); } @Override public Object detail(String id) { return null; } + + } diff --git a/backend/src/main/java/io/dataease/mobile/service/HomeService.java b/backend/src/main/java/io/dataease/mobile/service/HomeService.java index 41d23b7b6b..6bd2f80124 100644 --- a/backend/src/main/java/io/dataease/mobile/service/HomeService.java +++ b/backend/src/main/java/io/dataease/mobile/service/HomeService.java @@ -1,10 +1,15 @@ package io.dataease.mobile.service; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import io.dataease.auth.api.dto.CurrentRoleDto; import io.dataease.auth.api.dto.CurrentUserDto; import io.dataease.commons.utils.AuthUtils; +import io.dataease.commons.utils.PageUtils; +import io.dataease.commons.utils.Pager; import io.dataease.mobile.dto.HomeItemDTO; import io.dataease.base.mapper.ext.HomeMapper; +import io.dataease.mobile.dto.HomeRequest; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.HashMap; @@ -18,23 +23,33 @@ public class HomeService { @Resource private HomeMapper homeMapper; - public List query(Integer type) { + public Pager> query(HomeRequest request) { CurrentUserDto user = AuthUtils.getUser(); - switch (type){ + Page page = PageHelper.startPage(1, 13, true); + + Map param = new HashMap<>(); + param.put("userId", user.getUserId()); + switch (request.getType()){ + - case 1: - return homeMapper.queryHistory(); case 2: - Map param = new HashMap<>(); + Long deptId = user.getDeptId(); List roleIds = user.getRoles().stream().map(CurrentRoleDto::getId).collect(Collectors.toList()); - param.put("userId", user.getUserId()); + param.put("deptId", deptId); param.put("roleIds", roleIds); - List result = homeMapper.queryShare(param); - return result; + if (null != request.getLastTime()) { + param.put("lastTime", request.getLastTime()); + } + + return PageUtils.setPageInfo(page, homeMapper.queryShare(param)); default: - return homeMapper.queryStore(user.getUserId()); + param.put("userId", user.getUserId()); + if (null != request.getLastTime()) { + param.put("lastTime", request.getLastTime()); + } + return PageUtils.setPageInfo(page, homeMapper.queryStore(param)); } } }