From 75cd6ec3714f01fffcec6003be127fe773bafef5 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 3 Dec 2021 18:23:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/base/mapper/ext/HomeMapper.java | 15 +++++++ .../dataease/base/mapper/ext/HomeMapper.xml | 39 ++++++++++++++++ .../java/io/dataease/mobile/api/HomeApi.java | 26 +++++++++++ .../io/dataease/mobile/dto/HomeItemDTO.java | 18 ++++++++ .../io/dataease/mobile/server/HomeServer.java | 25 +++++++++++ .../dataease/mobile/service/HomeService.java | 44 +++++++++++++++++++ 6 files changed, 167 insertions(+) create mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.xml create mode 100644 backend/src/main/java/io/dataease/mobile/api/HomeApi.java create mode 100644 backend/src/main/java/io/dataease/mobile/dto/HomeItemDTO.java create mode 100644 backend/src/main/java/io/dataease/mobile/server/HomeServer.java create mode 100644 backend/src/main/java/io/dataease/mobile/service/HomeService.java 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 new file mode 100644 index 0000000000..027f620c69 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.java @@ -0,0 +1,15 @@ +package io.dataease.base.mapper.ext; + +import io.dataease.mobile.dto.HomeItemDTO; +import java.util.List; +import java.util.Map; + +public interface HomeMapper { + + + List queryStore(Long userId); + + List queryHistory(); + + List queryShare(Map param); +} 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 new file mode 100644 index 0000000000..fff3b708d4 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + diff --git a/backend/src/main/java/io/dataease/mobile/api/HomeApi.java b/backend/src/main/java/io/dataease/mobile/api/HomeApi.java new file mode 100644 index 0000000000..f92acb8dc5 --- /dev/null +++ b/backend/src/main/java/io/dataease/mobile/api/HomeApi.java @@ -0,0 +1,26 @@ +package io.dataease.mobile.api; + +import io.dataease.mobile.dto.HomeItemDTO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +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); + + @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/dto/HomeItemDTO.java b/backend/src/main/java/io/dataease/mobile/dto/HomeItemDTO.java new file mode 100644 index 0000000000..18e9085683 --- /dev/null +++ b/backend/src/main/java/io/dataease/mobile/dto/HomeItemDTO.java @@ -0,0 +1,18 @@ +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/server/HomeServer.java b/backend/src/main/java/io/dataease/mobile/server/HomeServer.java new file mode 100644 index 0000000000..3c923935cd --- /dev/null +++ b/backend/src/main/java/io/dataease/mobile/server/HomeServer.java @@ -0,0 +1,25 @@ +package io.dataease.mobile.server; + +import io.dataease.mobile.api.HomeApi; +import io.dataease.mobile.dto.HomeItemDTO; +import io.dataease.mobile.service.HomeService; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + +@RestController +public class HomeServer implements HomeApi { + + @Resource + private HomeService homeService; + + @Override + public List query(Integer type) { + return homeService.query(type); + } + + @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 new file mode 100644 index 0000000000..dbc7782ddb --- /dev/null +++ b/backend/src/main/java/io/dataease/mobile/service/HomeService.java @@ -0,0 +1,44 @@ +package io.dataease.mobile.service; + +import io.dataease.auth.api.dto.CurrentRoleDto; +import io.dataease.auth.api.dto.CurrentUserDto; +import io.dataease.commons.utils.AuthUtils; +import io.dataease.mobile.dto.HomeItemDTO; +import io.dataease.base.mapper.ext.HomeMapper; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +public class HomeService { + + @Resource + private HomeMapper homeMapper; + + public List query(Integer type) { + List result = new ArrayList<>(); + CurrentUserDto user = AuthUtils.getUser(); + switch (type){ + case 0: + result = homeMapper.queryStore(user.getUserId()); + break; + case 1: + result = homeMapper.queryHistory(); + break; + 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); + result = homeMapper.queryShare(param); + break; + } + return result; + } +} From 5d83ffe0cf3c0494b9ef82f6c6a19d1dc6016fc1 Mon Sep 17 00:00:00 2001 From: junjie Date: Mon, 6 Dec 2021 09:59:00 +0800 Subject: [PATCH 2/3] fix: rollback --- frontend/src/views/dataset/data/ViewTable.vue | 3 +++ frontend/src/views/dataset/group/Group.vue | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue index 4e5cfc86d7..133a2a251d 100644 --- a/frontend/src/views/dataset/data/ViewTable.vue +++ b/frontend/src/views/dataset/data/ViewTable.vue @@ -56,6 +56,9 @@ + + + diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue index 7587757244..8a83a8507d 100644 --- a/frontend/src/views/dataset/group/Group.vue +++ b/frontend/src/views/dataset/group/Group.vue @@ -89,6 +89,10 @@ {{ $t('dataset.excel_data') }} + + + {{ $t('dataset.custom_data') }} + {{ $t('dataset.union_data') }} From 297b26ca29a3261a553c69f2ae4d4c5d16d3d43d Mon Sep 17 00:00:00 2001 From: junjie Date: Mon, 6 Dec 2021 10:52:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=E8=AE=A1=E7=AE=97=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=97=A0=E9=9C=80=E5=B1=95=E7=A4=BA=E5=8E=9F=E5=A7=8B?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/data/FieldEdit.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue index eb1275f0c4..63faa3b88b 100644 --- a/frontend/src/views/dataset/data/FieldEdit.vue +++ b/frontend/src/views/dataset/data/FieldEdit.vue @@ -94,7 +94,7 @@ @@ -200,7 +203,7 @@