From e1f085670d9b456d2a95113e52c3140bd1eb4cb8 Mon Sep 17 00:00:00 2001 From: fjj <–1066869486@qq.com> Date: Thu, 21 Dec 2023 22:10:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=AE=A1=E7=90=862.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DatastandardController.java | 50 +++++++++++-------- .../srt/controller/StandardController.java | 19 ++++++- .../main/java/net/srt/dao/StandardDao.java | 5 +- .../StandardManagementQuery.java} | 10 ++-- .../java/net/srt/service/StandardService.java | 20 +------- .../srt/service/impl/StandardServiceImpl.java | 47 +++-------------- .../java/net/srt/vo/StandardManagementVo.java | 6 +-- 7 files changed, 67 insertions(+), 90 deletions(-) rename srt-cloud-data-governance/src/main/java/net/srt/{vo/StandardManagementParam.java => query/StandardManagementQuery.java} (50%) diff --git a/srt-cloud-data-governance/src/main/java/net/srt/controller/DatastandardController.java b/srt-cloud-data-governance/src/main/java/net/srt/controller/DatastandardController.java index ad918dd..8dfe1e7 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/controller/DatastandardController.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/DatastandardController.java @@ -1,17 +1,20 @@ package net.srt.controller; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; -import net.srt.vo.StandardManagementParam; +import net.srt.convert.DatastandardConvert; +import net.srt.entity.DatastandardEntity; import net.srt.framework.common.page.PageResult; import net.srt.framework.common.utils.Result; +import net.srt.query.StandardManagementQuery; +import net.srt.service.DatastandardService; import net.srt.vo.StandardManagementVo; -import net.srt.service.StandardService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.List; + /** * @ClassName : DatastandardController @@ -21,36 +24,41 @@ import javax.validation.Valid; */ @RestController @RequestMapping("/data-standard") -@Tag(name = "数据治理-标准管理") @AllArgsConstructor public class DatastandardController { @Autowired - private StandardService standardService; + DatastandardService datastandardService; + @GetMapping("page") @Operation(summary = "分页") - public Result> page(@Valid StandardManagementParam query){ - return Result.ok(standardService.pagea(query)); + public Result> page(@Valid StandardManagementQuery query){ + PageResult page = datastandardService.page(query); + return Result.ok(page); } + + @GetMapping("{id}") + @Operation(summary ="信息") + public Result get(@PathVariable("id") Integer categoryId) { + DatastandardEntity entity = datastandardService.getById(categoryId); + return Result.ok(DatastandardConvert.INSTANCE.convert(entity)); + } + + @GetMapping("/table-code/list") + @Operation(summary = "查询表编码") + public Result> getTableCode(){ + List list= datastandardService.getTableCode(); + return Result.ok(list); + } + + @PostMapping @Operation(summary = "保存") - public Result add(@RequestBody StandardManagementVo standardManagementVo){ - standardService.addStand(standardManagementVo); + public Result save(@RequestBody DatastandardEntity entity) { + datastandardService.save(entity); return Result.ok(); } - @PutMapping - @Operation(summary = "修改") - public Result update(@RequestBody @Valid StandardManagementVo standardManagementVo){ - standardService.updateStand(standardManagementVo); - return Result.ok(); - } - @DeleteMapping - @Operation(summary = "删除") - public Result delete(Long id){ - standardService.delete(id); - return Result.ok(); - } } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/controller/StandardController.java b/srt-cloud-data-governance/src/main/java/net/srt/controller/StandardController.java index fb9550f..705e1db 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/controller/StandardController.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/StandardController.java @@ -2,12 +2,16 @@ package net.srt.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import net.srt.entity.StandardEntity; +import net.srt.framework.common.utils.BeanUtil; import net.srt.framework.common.utils.Result; import net.srt.framework.common.utils.TreeNodeVo; import net.srt.service.StandardService; import org.springframework.beans.factory.annotation.Autowired; - -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -30,4 +34,15 @@ public class StandardController { } + @GetMapping("/{id}") + @Operation(summary = "根据id获取") + public Result getById(@PathVariable Integer id) { + StandardEntity entity = standardService.getById(id); + TreeNodeVo nodeVo = BeanUtil.copyProperties(entity, TreeNodeVo::new); + nodeVo.setLabel(entity.getName()); + nodeVo.setParentPath(entity.getPath().contains("/") ? entity.getPath().substring(0, entity.getPath().lastIndexOf("/")) : null); + return Result.ok(nodeVo); + } + + } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/dao/StandardDao.java b/srt-cloud-data-governance/src/main/java/net/srt/dao/StandardDao.java index 9a16555..b2dcb0f 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/dao/StandardDao.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/dao/StandardDao.java @@ -1,8 +1,7 @@ package net.srt.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import net.srt.entity.DatagovernanceEntity; -import net.srt.framework.mybatis.dao.BaseDao; +import net.srt.entity.StandardEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -12,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper; * @Date: 2023-12-20 11:30 */ @Mapper -public interface StandardDao extends BaseDao { +public interface StandardDao extends BaseMapper { } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/vo/StandardManagementParam.java b/srt-cloud-data-governance/src/main/java/net/srt/query/StandardManagementQuery.java similarity index 50% rename from srt-cloud-data-governance/src/main/java/net/srt/vo/StandardManagementParam.java rename to srt-cloud-data-governance/src/main/java/net/srt/query/StandardManagementQuery.java index f817bdf..98b9180 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/vo/StandardManagementParam.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/query/StandardManagementQuery.java @@ -1,18 +1,22 @@ -package net.srt.vo; +package net.srt.query; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import net.srt.framework.common.query.Query; /** - * @ClassName : StandardManagementParam + * @ClassName : StandardManagementQuery * @Description : * @Author : FJJ * @Date: 2023-12-20 14:40 */ @Data @EqualsAndHashCode(callSuper = false) -public class StandardManagementParam extends Query { +@Schema (description = "标准管理列表") +public class StandardManagementQuery extends Query { + private Integer categoryId; + private String t; private String cnName; private String engName; } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/StandardService.java b/srt-cloud-data-governance/src/main/java/net/srt/service/StandardService.java index 7d75ae3..ee69e54 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/service/StandardService.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/StandardService.java @@ -1,11 +1,8 @@ package net.srt.service; -import net.srt.framework.common.page.PageResult; +import net.srt.entity.StandardEntity; import net.srt.framework.common.utils.TreeNodeVo; import net.srt.framework.mybatis.service.BaseService; -import net.srt.vo.StandardManagementVo; -import net.srt.entity.DatagovernanceEntity; -import net.srt.vo.StandardManagementParam; import java.util.List; @@ -15,20 +12,7 @@ import java.util.List; * @Author : FJJ * @Date: 2023-12-20 11:31 */ -public interface StandardService extends BaseService { -// Page listpage(StandardManagementParam standardManagementRequest); +public interface StandardService extends BaseService { List listTree(); - - void addStand(StandardManagementVo standardManagementVo); - - void updateStand(StandardManagementVo standardManagementVo); - - void delete(Long id); - - PageResult pagea(StandardManagementParam query); - -// PageResult list(StandardManagementParam standardManagementRequest); -// -// void add(StandardManagementVo standardManagement); } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/StandardServiceImpl.java b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/StandardServiceImpl.java index 4af8553..e3e8fa9 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/StandardServiceImpl.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/StandardServiceImpl.java @@ -1,17 +1,14 @@ package net.srt.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.AllArgsConstructor; import net.srt.dao.StandardDao; -import net.srt.vo.StandardManagementParam; -import net.srt.framework.common.page.PageResult; +import net.srt.entity.StandardEntity; import net.srt.framework.common.utils.BeanUtil; import net.srt.framework.common.utils.BuildTreeUtils; import net.srt.framework.common.utils.TreeNodeVo; import net.srt.framework.mybatis.service.impl.BaseServiceImpl; -import net.srt.vo.StandardManagementVo; -import net.srt.entity.DatagovernanceEntity; import net.srt.service.StandardService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -23,17 +20,15 @@ import java.util.List; * @Date: 2023-12-20 11:31 */ @Service -public class StandardServiceImpl extends BaseServiceImpl implements StandardService { - @Autowired - private StandardDao standardDao; - +@AllArgsConstructor +public class StandardServiceImpl extends BaseServiceImpl implements StandardService { @Override public List listTree() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); dataScopeWithoutOrgId(wrapper); - wrapper.orderByAsc(DatagovernanceEntity::getOrderNo); - List dataFileCategoryEntities = baseMapper.selectList(wrapper); + wrapper.orderByAsc(StandardEntity::getOrderNo); + List dataFileCategoryEntities = baseMapper.selectList(wrapper); List treeNodeVos = BeanUtil.copyListProperties(dataFileCategoryEntities, TreeNodeVo::new, (oldItem, newItem) -> { newItem.setLabel(oldItem.getName()); newItem.setValue(oldItem.getId()); @@ -45,33 +40,5 @@ public class StandardServiceImpl extends BaseServiceImpl pagea(StandardManagementParam query) { - return null; - } - - -// -// @Override -// public void add(StandardManagementVo standardManagement) { -// UserDetail user = getUser(); -// standardManagement.setCreator(user.getUsername()); -// standardManagement.setCreateTime(new Date()); -// standardMapper.insert(standardManagement); -// } } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/vo/StandardManagementVo.java b/srt-cloud-data-governance/src/main/java/net/srt/vo/StandardManagementVo.java index 7128d76..ef6da78 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/vo/StandardManagementVo.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/vo/StandardManagementVo.java @@ -1,12 +1,12 @@ package net.srt.vo; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; import java.util.Date; /** @@ -17,8 +17,7 @@ import java.util.Date; */ @Data @Schema(description = "标准管理查询") -@TableName(value = "standard_management") -public class StandardManagementVo { +public class StandardManagementVo implements Serializable { private static final long serialVersionUID = 1L; @TableId("id") private Long id; @@ -46,4 +45,5 @@ public class StandardManagementVo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; private Integer ifStandardRel; + private String group; }